diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-12-18 16:25:22 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-12-18 16:25:22 +0000 |
| commit | 1ea4b50804c663085d1031fd61a040f53acf33df (patch) | |
| tree | 941dcd844ee7560bd8c231d0d983c41ebb5c295a /target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch | |
| parent | 440591ac63a185a099276194840813a02efd6f2e (diff) | |
| download | upstream-1ea4b50804c663085d1031fd61a040f53acf33df.tar.gz upstream-1ea4b50804c663085d1031fd61a040f53acf33df.tar.bz2 upstream-1ea4b50804c663085d1031fd61a040f53acf33df.zip | |
kernel: bgmac: fix some problems
There are some problems in the napi usage that are fixed now.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43749 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch index fe52ccc33e..bf3ab93830 100644 --- a/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch +++ b/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch @@ -30,7 +30,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> /************************************************** * BCMA bus ops **************************************************/ -@@ -1521,6 +1533,16 @@ static int bgmac_probe(struct bcma_devic +@@ -1523,6 +1535,16 @@ static int bgmac_probe(struct bcma_devic goto err_dma_free; } @@ -55,9 +55,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> + platform_device_unregister(&bgmac_b53_dev); + bgmac->b53_device = NULL; + - netif_napi_del(&bgmac->napi); unregister_netdev(bgmac->net_dev); bgmac_mii_unregister(bgmac); + netif_napi_del(&bgmac->napi); --- a/drivers/net/ethernet/broadcom/bgmac.h +++ b/drivers/net/ethernet/broadcom/bgmac.h @@ -457,6 +457,9 @@ struct bgmac { |