Commit bcf6cb1a authored by Rajesh Borundia's avatar Rajesh Borundia Committed by David S. Miller
Browse files

qlcnic: Fix initialization of vlan list. 



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

Signed-off-by: default avatarRajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 462bed48

drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c

+5 −6
Original line number Diff line number Diff line
@@ -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;