diff options
| author | Rasesh Mody <rmody@brocade.com> | 2010-12-23 21:45:03 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-25 19:16:00 -0800 |
| commit | 815f41e74031d6dc6d6dd988f58c03a1d72d02b9 (patch) | |
| tree | 6a7bf3f250ee5a2ac8ba74f6a26c36a4e76ea04e /drivers/net/bna/bnad.c | |
| parent | 0613ecfc94b13e86c9ff1252fd63e35a94475cd6 (diff) | |
| download | blackbird-op-linux-815f41e74031d6dc6d6dd988f58c03a1d72d02b9.tar.gz blackbird-op-linux-815f41e74031d6dc6d6dd988f58c03a1d72d02b9.zip | |
bna: Fix ethtool register dump and reordered an API
Change Details:
- Removed semaphore register dump from ethtool
- Moved netif_carrier_off() call to before calling bna_init()
Signed-off-by: Debashis Dutt <ddutt@brocade.com>
Signed-off-by: Rasesh Mody <rmody@brocade.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bna/bnad.c')
| -rw-r--r-- | drivers/net/bna/bnad.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/bna/bnad.c b/drivers/net/bna/bnad.c index 3c405022d2bb..5e7a0307f853 100644 --- a/drivers/net/bna/bnad.c +++ b/drivers/net/bna/bnad.c @@ -3061,6 +3061,9 @@ bnad_pci_probe(struct pci_dev *pdev, /* Initialize netdev structure, set up ethtool ops */ bnad_netdev_init(bnad, using_dac); + /* Set link to down state */ + netif_carrier_off(netdev); + bnad_enable_msix(bnad); /* Get resource requirement form bna */ @@ -3114,11 +3117,6 @@ bnad_pci_probe(struct pci_dev *pdev, mutex_unlock(&bnad->conf_mutex); - /* - * Make sure the link appears down to the stack - */ - netif_carrier_off(netdev); - /* Finally, reguister with net_device layer */ err = register_netdev(netdev); if (err) { |
