diff options
| author | Rasesh Mody <rmody@brocade.com> | 2010-12-23 21:45:03 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-26 03:16:00 (GMT) |
| commit | 815f41e74031d6dc6d6dd988f58c03a1d72d02b9 (patch) | |
| tree | 6a7bf3f250ee5a2ac8ba74f6a26c36a4e76ea04e /drivers/net/bna | |
| parent | 0613ecfc94b13e86c9ff1252fd63e35a94475cd6 (diff) | |
| download | linux-815f41e74031d6dc6d6dd988f58c03a1d72d02b9.tar.xz | |
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')
| -rw-r--r-- | drivers/net/bna/bnad.c | 8 | ||||
| -rw-r--r-- | drivers/net/bna/bnad_ethtool.c | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/bna/bnad.c b/drivers/net/bna/bnad.c index 3c40502..5e7a030 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) { diff --git a/drivers/net/bna/bnad_ethtool.c b/drivers/net/bna/bnad_ethtool.c index 11fa2ea..3011110 100644 --- a/drivers/net/bna/bnad_ethtool.c +++ b/drivers/net/bna/bnad_ethtool.c @@ -330,10 +330,6 @@ do { \ BNAD_GET_REG(PCIE_MISC_REG); - BNAD_GET_REG(HOST_SEM0_REG); - BNAD_GET_REG(HOST_SEM1_REG); - BNAD_GET_REG(HOST_SEM2_REG); - BNAD_GET_REG(HOST_SEM3_REG); BNAD_GET_REG(HOST_SEM0_INFO_REG); BNAD_GET_REG(HOST_SEM1_INFO_REG); BNAD_GET_REG(HOST_SEM2_INFO_REG); |