Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 815f41e7 authored by Rasesh Mody's avatar Rasesh Mody Committed by David S. Miller
Browse files

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: default avatarDebashis Dutt <ddutt@brocade.com>
Signed-off-by: default avatarRasesh Mody <rmody@brocade.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0613ecfc

drivers/net/bna/bnad.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -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) {

drivers/net/bna/bnad_ethtool.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -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);