diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-02-14 10:45:12 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-02-14 10:45:12 +0000 |
| commit | 9f5845114a041201d1f7a47fe92b97963bdd0c3c (patch) | |
| tree | 427020270e6176a939c45403d2ed098299be26f5 /target/linux/generic/patches-3.18/070-bgmac-register-napi-before-the-device.patch | |
| parent | 1c8c37a44a362018420808f526d3a984a96349ef (diff) | |
| download | master-187ad058-9f5845114a041201d1f7a47fe92b97963bdd0c3c.tar.gz master-187ad058-9f5845114a041201d1f7a47fe92b97963bdd0c3c.tar.bz2 master-187ad058-9f5845114a041201d1f7a47fe92b97963bdd0c3c.zip | |
generic: upgrade to 3.18.7
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44442 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/070-bgmac-register-napi-before-the-device.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/070-bgmac-register-napi-before-the-device.patch | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/generic/patches-3.18/070-bgmac-register-napi-before-the-device.patch b/target/linux/generic/patches-3.18/070-bgmac-register-napi-before-the-device.patch index 2eba9eee82..aa45860e93 100644 --- a/target/linux/generic/patches-3.18/070-bgmac-register-napi-before-the-device.patch +++ b/target/linux/generic/patches-3.18/070-bgmac-register-napi-before-the-device.patch @@ -11,11 +11,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net> drivers/net/ethernet/broadcom/bgmac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c -index 05c6af6..aa9f950 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -1515,6 +1515,8 @@ static int bgmac_probe(struct bcma_device *core) +@@ -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"); @@ -24,7 +22,7 @@ index 05c6af6..aa9f950 100644 err = bgmac_mii_register(bgmac); if (err) { bgmac_err(bgmac, "Cannot register MDIO\n"); -@@ -1529,8 +1531,6 @@ static int bgmac_probe(struct bcma_device *core) +@@ -1529,8 +1531,6 @@ static int bgmac_probe(struct bcma_devic netif_carrier_off(net_dev); @@ -33,7 +31,7 @@ index 05c6af6..aa9f950 100644 return 0; err_mii_unregister: -@@ -1549,9 +1549,9 @@ static void bgmac_remove(struct bcma_device *core) +@@ -1549,9 +1549,9 @@ static void bgmac_remove(struct bcma_dev { struct bgmac *bgmac = bcma_get_drvdata(core); @@ -44,6 +42,3 @@ index 05c6af6..aa9f950 100644 bgmac_dma_free(bgmac); bcma_set_drvdata(core, NULL); free_netdev(bgmac->net_dev); --- -1.8.4.5 - |