|
@@ -448,8 +448,7 @@ static int qlcnic_sriov_set_guest_vlan_mode(struct qlcnic_adapter *adapter,
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-static int qlcnic_sriov_get_vf_acl(struct qlcnic_adapter *adapter,
|
|
|
|
- struct qlcnic_info *info)
|
|
|
|
|
|
+static int qlcnic_sriov_get_vf_acl(struct qlcnic_adapter *adapter)
|
|
{
|
|
{
|
|
struct qlcnic_sriov *sriov = adapter->ahw->sriov;
|
|
struct qlcnic_sriov *sriov = adapter->ahw->sriov;
|
|
struct qlcnic_cmd_args cmd;
|
|
struct qlcnic_cmd_args cmd;
|
|
@@ -495,10 +494,6 @@ static int qlcnic_sriov_vf_init_driver(struct qlcnic_adapter *adapter)
|
|
if (err)
|
|
if (err)
|
|
return -EIO;
|
|
return -EIO;
|
|
|
|
|
|
- err = qlcnic_sriov_get_vf_acl(adapter, &nic_info);
|
|
|
|
- if (err)
|
|
|
|
- return err;
|
|
|
|
-
|
|
|
|
if (qlcnic_83xx_get_port_info(adapter))
|
|
if (qlcnic_83xx_get_port_info(adapter))
|
|
return -EIO;
|
|
return -EIO;
|
|
|
|
|
|
@@ -555,6 +550,10 @@ static int qlcnic_sriov_setup_vf(struct qlcnic_adapter *adapter,
|
|
if (err)
|
|
if (err)
|
|
goto err_out_send_channel_term;
|
|
goto err_out_send_channel_term;
|
|
|
|
|
|
|
|
+ err = qlcnic_sriov_get_vf_acl(adapter);
|
|
|
|
+ if (err)
|
|
|
|
+ goto err_out_send_channel_term;
|
|
|
|
+
|
|
err = qlcnic_setup_netdev(adapter, adapter->netdev, pci_using_dac);
|
|
err = qlcnic_setup_netdev(adapter, adapter->netdev, pci_using_dac);
|
|
if (err)
|
|
if (err)
|
|
goto err_out_send_channel_term;
|
|
goto err_out_send_channel_term;
|