3 files changed, 11 insertions, 35 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index c1b693cb3df3..60f310a542da 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -303,7 +303,6 @@ extern int qlcnic_use_msi;
 extern int qlcnic_use_msi_x;
 extern int qlcnic_auto_fw_reset;
 extern int qlcnic_load_fw_file;
-extern int qlcnic_config_npars;
 
 /* Number of status descriptors to handle per interrupt */
 #define MAX_STATUS_HANDLE       (64)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
index b0c3de9ede03..55e5e1b5ad4f 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
@@ -42,27 +42,18 @@ int qlcnic_83xx_disable_vnic_mode(struct qlcnic_adapter *adapter, int lock)
 static int qlcnic_83xx_set_vnic_opmode(struct qlcnic_adapter *adapter)
 {
         u8 id;
-        int i, ret = -EBUSY;
+        int ret = -EBUSY;
         u32 data = QLCNIC_MGMT_FUNC;
         struct qlcnic_hardware_context *ahw = adapter->ahw;
 
         if (qlcnic_83xx_lock_driver(adapter))
                 return ret;
 
-        if (qlcnic_config_npars) {
-                for (i = 0; i < ahw->act_pci_func; i++) {
-                        id = adapter->npars[i].pci_func;
-                        if (id == ahw->pci_func)
-                                continue;
-                        data |= qlcnic_config_npars &
-                                QLC_83XX_SET_FUNC_OPMODE(0x3, id);
-                }
-        } else {
-                data = QLCRDX(adapter->ahw, QLC_83XX_DRV_OP_MODE);
-                data = (data & ~QLC_83XX_SET_FUNC_OPMODE(0x3, ahw->pci_func)) |
-                       QLC_83XX_SET_FUNC_OPMODE(QLCNIC_MGMT_FUNC,
-                                                ahw->pci_func);
-        }
+        id = ahw->pci_func;
+        data = QLCRDX(adapter->ahw, QLC_83XX_DRV_OP_MODE);
+        data = (data & ~QLC_83XX_SET_FUNC_OPMODE(0x3, id)) |
+               QLC_83XX_SET_FUNC_OPMODE(QLCNIC_MGMT_FUNC, id);
+
         QLCWRX(adapter->ahw, QLC_83XX_DRV_OP_MODE, data);
 
         qlcnic_83xx_unlock_driver(adapter);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 76b95b48c815..5b18b0accb06 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -52,10 +52,6 @@ int qlcnic_load_fw_file;
 MODULE_PARM_DESC(load_fw_file, "Load firmware from (0=flash, 1=file)");
 module_param_named(load_fw_file, qlcnic_load_fw_file, int, 0444);
 
-int qlcnic_config_npars;
-module_param(qlcnic_config_npars, int, 0444);
-MODULE_PARM_DESC(qlcnic_config_npars, "Configure NPARs (0=disabled, 1=enabled)");
-
 static int qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 static void qlcnic_remove(struct pci_dev *pdev);
 static int qlcnic_open(struct net_device *netdev);
@@ -769,7 +765,7 @@ static int
 qlcnic_set_function_modes(struct qlcnic_adapter *adapter)
 {
         u8 id;
-        int i, ret = 1;
+        int ret;
         u32 data = QLCNIC_MGMT_FUNC;
         struct qlcnic_hardware_context *ahw = adapter->ahw;
 
@@ -777,20 +773,10 @@ qlcnic_set_function_modes(struct qlcnic_adapter *adapter)
         if (ret)
                 goto err_lock;
 
-        if (qlcnic_config_npars) {
-                for (i = 0; i < ahw->act_pci_func; i++) {
-                        id = adapter->npars[i].pci_func;
-                        if (id == ahw->pci_func)
-                                continue;
-                        data |= (qlcnic_config_npars &
-                                        QLC_DEV_SET_DRV(0xf, id));
-                }
-        } else {
-                data = QLC_SHARED_REG_RD32(adapter, QLCNIC_DRV_OP_MODE);
-                data = (data & ~QLC_DEV_SET_DRV(0xf, ahw->pci_func)) |
-                        (QLC_DEV_SET_DRV(QLCNIC_MGMT_FUNC,
-                                         ahw->pci_func));
-        }
+        id = ahw->pci_func;
+        data = QLC_SHARED_REG_RD32(adapter, QLCNIC_DRV_OP_MODE);
+        data = (data & ~QLC_DEV_SET_DRV(0xf, id)) |
+               QLC_DEV_SET_DRV(QLCNIC_MGMT_FUNC, id);
         QLC_SHARED_REG_WR32(adapter, QLCNIC_DRV_OP_MODE, data);
         qlcnic_api_unlock(adapter);
 err_lock: