diff options
| author | Sucheta Chakraborty <sucheta.chakraborty@qlogic.com> | 2014-04-14 10:02:19 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-04-14 13:43:52 -0400 |
| commit | 4d52e1e8d1e198962dcbfabf9c06425c38eb23d0 (patch) | |
| tree | cb4720c93b7c86d0af0ef93bd3950f247983a1c4 /drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |
| parent | 463518a0cbd396aac83ee3d196897d585e173796 (diff) | |
| download | talos-obmc-linux-4d52e1e8d1e198962dcbfabf9c06425c38eb23d0.tar.gz talos-obmc-linux-4d52e1e8d1e198962dcbfabf9c06425c38eb23d0.zip | |
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: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 309d05640883..84d011ed7ec2 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -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; |
