aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/773-bgmac-add-srab-switch.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-12-18 16:25:22 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-12-18 16:25:22 +0000
commitabca0462d3344082aec3083b7ce612286abc4d0d (patch)
tree30324bd8b41ff7c4eefdbd19e5f9cf8fc41ab962 /target/linux/generic/patches-3.14/773-bgmac-add-srab-switch.patch
parent192e945479a9c90eb7d6a3ff563084cb558ba31a (diff)
downloadupstream-abca0462d3344082aec3083b7ce612286abc4d0d.tar.gz
upstream-abca0462d3344082aec3083b7ce612286abc4d0d.tar.bz2
upstream-abca0462d3344082aec3083b7ce612286abc4d0d.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> SVN-Revision: 43749
Diffstat (limited to 'target/linux/generic/patches-3.14/773-bgmac-add-srab-switch.patch')
-rw-r--r--target/linux/generic/patches-3.14/773-bgmac-add-srab-switch.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.14/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-3.14/773-bgmac-add-srab-switch.patch
index fe52ccc33e..bf3ab93830 100644
--- a/target/linux/generic/patches-3.14/773-bgmac-add-srab-switch.patch
+++ b/target/linux/generic/patches-3.14/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 {