Skip to content

Commit

Permalink
bna: Fix ethtool register dump and reordered an API
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rasesh Mody authored and David S. Miller committed Dec 26, 2010
1 parent 0613ecf commit 815f41e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
8 changes: 3 additions & 5 deletions drivers/net/bna/bnad.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 0 additions & 4 deletions drivers/net/bna/bnad_ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 815f41e

Please sign in to comment.