diff options
author | Rasesh Mody <rmody@brocade.com> | 2010-12-23 16:45:03 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-25 22:16:00 -0500 |
commit | 815f41e74031d6dc6d6dd988f58c03a1d72d02b9 (patch) | |
tree | 6a7bf3f250ee5a2ac8ba74f6a26c36a4e76ea04e /drivers/net/bna/bnad.c | |
parent | 0613ecfc94b13e86c9ff1252fd63e35a94475cd6 (diff) |
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, | |||
3061 | /* Initialize netdev structure, set up ethtool ops */ | 3061 | /* Initialize netdev structure, set up ethtool ops */ |
3062 | bnad_netdev_init(bnad, using_dac); | 3062 | bnad_netdev_init(bnad, using_dac); |
3063 | 3063 | ||
3064 | /* Set link to down state */ | ||
3065 | netif_carrier_off(netdev); | ||
3066 | |||
3064 | bnad_enable_msix(bnad); | 3067 | bnad_enable_msix(bnad); |
3065 | 3068 | ||
3066 | /* Get resource requirement form bna */ | 3069 | /* Get resource requirement form bna */ |
@@ -3114,11 +3117,6 @@ bnad_pci_probe(struct pci_dev *pdev, | |||
3114 | 3117 | ||
3115 | mutex_unlock(&bnad->conf_mutex); | 3118 | mutex_unlock(&bnad->conf_mutex); |
3116 | 3119 | ||
3117 | /* | ||
3118 | * Make sure the link appears down to the stack | ||
3119 | */ | ||
3120 | netif_carrier_off(netdev); | ||
3121 | |||
3122 | /* Finally, reguister with net_device layer */ | 3120 | /* Finally, reguister with net_device layer */ |
3123 | err = register_netdev(netdev); | 3121 | err = register_netdev(netdev); |
3124 | if (err) { | 3122 | if (err) { |