44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
|
From d5b4e70e8c205a67e2e246908b259367ab9ccecf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||
|
|
Date: Mon, 8 Dec 2014 08:27:23 +0100
|
||
|
|
Subject: [PATCH 2/4] bgmac: register napi before the device
|
||
|
|
|
||
|
|
napi should get registered before the netdev and not after.
|
||
|
|
|
||
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/broadcom/bgmac.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/ethernet/broadcom/bgmac.c
|
||
|
|
+++ b/drivers/net/ethernet/broadcom/bgmac.c
|
||
|
|
@@ -1515,6 +1515,8 @@ static int bgmac_probe(struct bcma_devic
|
||
|
|
if (core->bus->sprom.boardflags_lo & BGMAC_BFL_ENETADM)
|
||
|
|
bgmac_warn(bgmac, "Support for ADMtek ethernet switch not implemented\n");
|
||
|
|
|
||
|
|
+ netif_napi_add(net_dev, &bgmac->napi, bgmac_poll, BGMAC_WEIGHT);
|
||
|
|
+
|
||
|
|
err = bgmac_mii_register(bgmac);
|
||
|
|
if (err) {
|
||
|
|
bgmac_err(bgmac, "Cannot register MDIO\n");
|
||
|
|
@@ -1529,8 +1531,6 @@ static int bgmac_probe(struct bcma_devic
|
||
|
|
|
||
|
|
netif_carrier_off(net_dev);
|
||
|
|
|
||
|
|
- netif_napi_add(net_dev, &bgmac->napi, bgmac_poll, BGMAC_WEIGHT);
|
||
|
|
-
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
err_mii_unregister:
|
||
|
|
@@ -1549,9 +1549,9 @@ static void bgmac_remove(struct bcma_dev
|
||
|
|
{
|
||
|
|
struct bgmac *bgmac = bcma_get_drvdata(core);
|
||
|
|
|
||
|
|
- netif_napi_del(&bgmac->napi);
|
||
|
|
unregister_netdev(bgmac->net_dev);
|
||
|
|
bgmac_mii_unregister(bgmac);
|
||
|
|
+ netif_napi_del(&bgmac->napi);
|
||
|
|
bgmac_dma_free(bgmac);
|
||
|
|
bcma_set_drvdata(core, NULL);
|
||
|
|
free_netdev(bgmac->net_dev);
|