lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bna: Fix ethtool register dump and reordered an API

Browse Source 
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>
This commit is contained in:
Rasesh Mody
2010-12-23 21:45:03 +00:00
committed by David S. Miller
parent 0613ecfc94
commit 815f41e740
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/bna/bnad.c
View File

@@ -3061,6 +3061,9 @@ bnad_pci_probe(struct pci_dev *pdev,
/* Initialize netdev structure, set up ethtool ops */ /* Initialize netdev structure, set up ethtool ops */
bnad_netdev_init(bnad, using_dac); bnad_netdev_init(bnad, using_dac);
/* Set link to down state */
netif_carrier_off(netdev);
bnad_enable_msix(bnad); bnad_enable_msix(bnad);
/* Get resource requirement form bna */ /* Get resource requirement form bna */
@@ -3114,11 +3117,6 @@ bnad_pci_probe(struct pci_dev *pdev,
mutex_unlock(&bnad->conf_mutex); mutex_unlock(&bnad->conf_mutex);
/*
* Make sure the link appears down to the stack
*/
netif_carrier_off(netdev);
/* Finally, reguister with net_device layer */ /* Finally, reguister with net_device layer */
err = register_netdev(netdev); err = register_netdev(netdev);
if (err) { if (err) {

4
drivers/net/bna/bnad_ethtool.c
View File

@@ -330,10 +330,6 @@ do { \
BNAD_GET_REG(PCIE_MISC_REG); 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_SEM0_INFO_REG);
BNAD_GET_REG(HOST_SEM1_INFO_REG); BNAD_GET_REG(HOST_SEM1_INFO_REG);
BNAD_GET_REG(HOST_SEM2_INFO_REG); BNAD_GET_REG(HOST_SEM2_INFO_REG);