Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d52e1e8 authored by Sucheta Chakraborty's avatar Sucheta Chakraborty Committed by David S. Miller
Browse files

qlcnic: Fix to send INIT_NIC_FUNC as first mailbox. 



o INIT_NIC_FUNC should be first mailbox sent. Sending DCB capability and
  parameter query commands after that command.

Signed-off-by: default avatarSucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: default avatarShahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 463518a0

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

+2 −0
Original line number Diff line number Diff line
@@ -2355,7 +2355,9 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac) 
		goto disable_mbx_intr;



	qlcnic_83xx_clear_function_resources(adapter);

	qlcnic_dcb_enable(adapter->dcb);

	qlcnic_83xx_initialize_nic(adapter, 1);

	qlcnic_dcb_get_info(adapter->dcb);



	/* Configure default, SR-IOV or Virtual NIC mode of operation */

	err = qlcnic_83xx_configure_opmode(adapter);

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

+0 −2
Original line number Diff line number Diff line
@@ -330,8 +330,6 @@ static int __qlcnic_dcb_attach(struct qlcnic_dcb *dcb) 
		goto out_free_cfg;

	}



	qlcnic_dcb_get_info(dcb);



	return 0;

out_free_cfg:

	kfree(dcb->cfg);

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

+3 −2
Original line number Diff line number Diff line
@@ -2528,8 +2528,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_out_free_hw;

	}



	qlcnic_dcb_enable(adapter->dcb);



	if (qlcnic_read_mac_addr(adapter))

		dev_warn(&pdev->dev, "failed to read mac addr\n");
@@ -2549,7 +2547,10 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
			 "Device does not support MSI interrupts\n");



	if (qlcnic_82xx_check(adapter)) {

		qlcnic_dcb_enable(adapter->dcb);

		qlcnic_dcb_get_info(adapter->dcb);

		err = qlcnic_setup_intr(adapter);



		if (err) {

			dev_err(&pdev->dev, "Failed to setup interrupt\n");

			goto err_out_disable_msi;