|
@@ -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:
|