aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSony Chacko <sony.chacko@qlogic.com>2011-04-01 10:27:47 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-06 15:47:10 -0400
commit53478fef7490c90564dd328b395f238952d95c77 (patch)
treef48a344383a767f62e023762985a7401d98ea63a
parent1ca050d909add6825224c015d8cec2425b3edf27 (diff)
qlcnic: Make PCI info available in all modes
Before this fix, PCI info was available only when multiple NIC functions are present on the same port. Signed-off-by: Sony Chacko <sony.chacko@qlogic.com> Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/qlcnic/qlcnic_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index cd88c7e1bfa9..d230fdde28af 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -3954,14 +3954,14 @@ qlcnic_create_diag_entries(struct qlcnic_adapter *adapter)
3954 dev_info(dev, "failed to create crb sysfs entry\n"); 3954 dev_info(dev, "failed to create crb sysfs entry\n");
3955 if (device_create_bin_file(dev, &bin_attr_mem)) 3955 if (device_create_bin_file(dev, &bin_attr_mem))
3956 dev_info(dev, "failed to create mem sysfs entry\n"); 3956 dev_info(dev, "failed to create mem sysfs entry\n");
3957 if (device_create_bin_file(dev, &bin_attr_pci_config))
3958 dev_info(dev, "failed to create pci config sysfs entry");
3957 if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED)) 3959 if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED))
3958 return; 3960 return;
3959 if (device_create_bin_file(dev, &bin_attr_esw_config)) 3961 if (device_create_bin_file(dev, &bin_attr_esw_config))
3960 dev_info(dev, "failed to create esw config sysfs entry"); 3962 dev_info(dev, "failed to create esw config sysfs entry");
3961 if (adapter->op_mode != QLCNIC_MGMT_FUNC) 3963 if (adapter->op_mode != QLCNIC_MGMT_FUNC)
3962 return; 3964 return;
3963 if (device_create_bin_file(dev, &bin_attr_pci_config))
3964 dev_info(dev, "failed to create pci config sysfs entry");
3965 if (device_create_bin_file(dev, &bin_attr_npar_config)) 3965 if (device_create_bin_file(dev, &bin_attr_npar_config))
3966 dev_info(dev, "failed to create npar config sysfs entry"); 3966 dev_info(dev, "failed to create npar config sysfs entry");
3967 if (device_create_bin_file(dev, &bin_attr_pm_config)) 3967 if (device_create_bin_file(dev, &bin_attr_pm_config))
@@ -3982,12 +3982,12 @@ qlcnic_remove_diag_entries(struct qlcnic_adapter *adapter)
3982 device_remove_file(dev, &dev_attr_diag_mode); 3982 device_remove_file(dev, &dev_attr_diag_mode);
3983 device_remove_bin_file(dev, &bin_attr_crb); 3983 device_remove_bin_file(dev, &bin_attr_crb);
3984 device_remove_bin_file(dev, &bin_attr_mem); 3984 device_remove_bin_file(dev, &bin_attr_mem);
3985 device_remove_bin_file(dev, &bin_attr_pci_config);
3985 if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED)) 3986 if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED))
3986 return; 3987 return;
3987 device_remove_bin_file(dev, &bin_attr_esw_config); 3988 device_remove_bin_file(dev, &bin_attr_esw_config);
3988 if (adapter->op_mode != QLCNIC_MGMT_FUNC) 3989 if (adapter->op_mode != QLCNIC_MGMT_FUNC)
3989 return; 3990 return;
3990 device_remove_bin_file(dev, &bin_attr_pci_config);
3991 device_remove_bin_file(dev, &bin_attr_npar_config); 3991 device_remove_bin_file(dev, &bin_attr_npar_config);
3992 device_remove_bin_file(dev, &bin_attr_pm_config); 3992 device_remove_bin_file(dev, &bin_attr_pm_config);
3993 device_remove_bin_file(dev, &bin_attr_esw_stats); 3993 device_remove_bin_file(dev, &bin_attr_esw_stats);