1 files changed, 32 insertions, 7 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
index c5cfbaa832a8..58f094ca052e 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
@@ -7,6 +7,18 @@
 
 #include "qlcnic.h"
 
+static int qlcnic_is_valid_nic_func(struct qlcnic_adapter *adapter, u8 pci_func)
+{
+        int i;
+
+        for (i = 0; i < adapter->ahw->act_pci_func; i++) {
+                if (adapter->npars[i].pci_func == pci_func)
+                        return i;
+        }
+
+        return -1;
+}
+
 static u32
 qlcnic_poll_rsp(struct qlcnic_adapter *adapter)
 {
@@ -817,11 +829,14 @@ int qlcnic_get_pci_info(struct qlcnic_adapter *adapter,
         qlcnic_issue_cmd(adapter, &cmd);
         err = cmd.rsp.cmd;
 
+        adapter->ahw->act_pci_func = 0;
         if (err == QLCNIC_RCODE_SUCCESS) {
                 for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++, npar++, pci_info++) {
                         pci_info->id = le16_to_cpu(npar->id);
                         pci_info->active = le16_to_cpu(npar->active);
                         pci_info->type = le16_to_cpu(npar->type);
+                        if (pci_info->type == QLCNIC_TYPE_NIC)
+                                adapter->ahw->act_pci_func++;
                         pci_info->default_port =
                                 le16_to_cpu(npar->default_port);
                         pci_info->tx_min_bw =
@@ -1016,12 +1031,13 @@ int qlcnic_get_eswitch_stats(struct qlcnic_adapter *adapter, const u8 eswitch,
         esw_stats->numbytes = QLCNIC_STATS_NOT_AVAIL;
         esw_stats->context_id = eswitch;
 
-        for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
+        for (i = 0; i < adapter->ahw->act_pci_func; i++) {
                 if (adapter->npars[i].phy_port != eswitch)
                         continue;
 
                 memset(&port_stats, 0, sizeof(struct __qlcnic_esw_statistics));
-                if (qlcnic_get_port_stats(adapter, i, rx_tx, &port_stats))
+                if (qlcnic_get_port_stats(adapter, adapter->npars[i].pci_func,
+                                          rx_tx, &port_stats))
                         continue;
 
                 esw_stats->size = port_stats.size;
@@ -1120,7 +1136,7 @@ op_type = 1 for port vlan_id
 int qlcnic_config_switch_port(struct qlcnic_adapter *adapter,
                 struct qlcnic_esw_func_cfg *esw_cfg)
 {
-        int err = -EIO;
+        int err = -EIO, index;
         u32 arg1, arg2 = 0;
         struct qlcnic_cmd_args cmd;
         u8 pci_func;
@@ -1128,7 +1144,10 @@ int qlcnic_config_switch_port(struct qlcnic_adapter *adapter,
         if (adapter->ahw->op_mode != QLCNIC_MGMT_FUNC)
                 return err;
         pci_func = esw_cfg->pci_func;
-        arg1 = (adapter->npars[pci_func].phy_port & BIT_0);
+        index = qlcnic_is_valid_nic_func(adapter, pci_func);
+        if (index < 0)
+                return err;
+        arg1 = (adapter->npars[index].phy_port & BIT_0);
         arg1 |= (pci_func << 8);
 
         if (__qlcnic_get_eswitch_port_config(adapter, &arg1, &arg2))
@@ -1192,11 +1211,17 @@ qlcnic_get_eswitch_port_config(struct qlcnic_adapter *adapter,
                         struct qlcnic_esw_func_cfg *esw_cfg)
 {
         u32 arg1, arg2;
+        int index;
         u8 phy_port;
-        if (adapter->ahw->op_mode == QLCNIC_MGMT_FUNC)
-                phy_port = adapter->npars[esw_cfg->pci_func].phy_port;
-        else
+
+        if (adapter->ahw->op_mode == QLCNIC_MGMT_FUNC) {
+                index = qlcnic_is_valid_nic_func(adapter, esw_cfg->pci_func);
+                if (index < 0)
+                        return -EIO;
+                phy_port = adapter->npars[index].phy_port;
+        } else {
                 phy_port = adapter->ahw->physical_port;
+        }
         arg1 = phy_port;
         arg1 |= (esw_cfg->pci_func << 8);
         if (__qlcnic_get_eswitch_port_config(adapter, &arg1, &arg2))