qlcnic: Fix initialization of vlan list.

o Do not re-initialize vlan list in case of adapter reset.

Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
index 17a1ca2050f4..0638c1810d54 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
@@ -448,8 +448,7 @@ static int qlcnic_sriov_set_guest_vlan_mode(struct qlcnic_adapter *adapter,
         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_cmd_args cmd;
@@ -495,10 +494,6 @@ static int qlcnic_sriov_vf_init_driver(struct qlcnic_adapter *adapter)
         if (err)
                 return -EIO;
 
-        err = qlcnic_sriov_get_vf_acl(adapter, &nic_info);
-        if (err)
-                return err;
-
         if (qlcnic_83xx_get_port_info(adapter))
                 return -EIO;
 
@@ -555,6 +550,10 @@ static int qlcnic_sriov_setup_vf(struct qlcnic_adapter *adapter,
         if (err)
                 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);
         if (err)
                 goto err_out_send_channel_term;