1 files changed, 17 insertions, 2 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
index 660c3f5b2237..c6165d05cc13 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
@@ -465,8 +465,14 @@ static ssize_t qlcnic_sysfs_read_pm_config(struct file *filp,
         memset(&pm_cfg, 0,
                sizeof(struct qlcnic_pm_func_cfg) * QLCNIC_MAX_PCI_FUNC);
 
-        for (i = 0; i < adapter->ahw->act_pci_func; i++) {
+        for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
                 pci_func = adapter->npars[i].pci_func;
+                if (!adapter->npars[i].active)
+                        continue;
+
+                if (!adapter->npars[i].eswitch_status)
+                        continue;
+
                 pm_cfg[pci_func].action = adapter->npars[i].enable_pm;
                 pm_cfg[pci_func].dest_npar = 0;
                 pm_cfg[pci_func].pci_func = i;
@@ -632,8 +638,14 @@ static ssize_t qlcnic_sysfs_read_esw_config(struct file *file,
         memset(&esw_cfg, 0,
                sizeof(struct qlcnic_esw_func_cfg) * QLCNIC_MAX_PCI_FUNC);
 
-        for (i = 0; i < adapter->ahw->act_pci_func; i++) {
+        for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
                 pci_func = adapter->npars[i].pci_func;
+                if (!adapter->npars[i].active)
+                        continue;
+
+                if (!adapter->npars[i].eswitch_status)
+                        continue;
+
                 esw_cfg[pci_func].pci_func = pci_func;
                 if (qlcnic_get_eswitch_port_config(adapter, &esw_cfg[pci_func]))
                         return QL_STATUS_INVALID_PARAM;
@@ -732,6 +744,9 @@ static ssize_t qlcnic_sysfs_read_npar_config(struct file *file,
                 if (ret)
                         return ret;
 
+                if (!adapter->npars[i].eswitch_status)
+                        continue;
+
                 np_cfg[i].pci_func = i;
                 np_cfg[i].op_mode = (u8)nic_info.op_mode;
                 np_cfg[i].port_num = nic_info.phys_port;