diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-02-11 17:35:09 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-02-11 17:35:09 +0000 |
| commit | c419d3be121a35680753f4709a070b5da239d97c (patch) | |
| tree | 66dad4e406ff8b89770b9fb91d19b19ed922505e /target/linux/generic/patches-3.14/771-bgmac-register-napi-before-the-device.patch | |
| parent | 656eef3a505d9d1493c5e9db5a7d86e55544e9e1 (diff) | |
| download | master-187ad058-c419d3be121a35680753f4709a070b5da239d97c.tar.gz master-187ad058-c419d3be121a35680753f4709a070b5da239d97c.tar.bz2 master-187ad058-c419d3be121a35680753f4709a070b5da239d97c.zip | |
kernel: backport mainlined bgmac patches from 3.19
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44410 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/771-bgmac-register-napi-before-the-device.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/771-bgmac-register-napi-before-the-device.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/target/linux/generic/patches-3.14/771-bgmac-register-napi-before-the-device.patch b/target/linux/generic/patches-3.14/771-bgmac-register-napi-before-the-device.patch deleted file mode 100644 index 56248c6720..0000000000 --- a/target/linux/generic/patches-3.14/771-bgmac-register-napi-before-the-device.patch +++ /dev/null @@ -1,43 +0,0 @@ -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); |