diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-03-03 14:39:52 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-03-03 14:39:52 +0000 |
| commit | 1e4f59c670ab366ca741c2dd4a9f50c07b39642a (patch) | |
| tree | d11cb18363df423e9fba6fbbf9483eebec4454f0 /target/linux/generic/patches-3.14/074-bgmac-register-napi-before-the-device.patch | |
| parent | ead555a94ac5363cc751353d12ff7482854d4c06 (diff) | |
| download | upstream-1e4f59c670ab366ca741c2dd4a9f50c07b39642a.tar.gz upstream-1e4f59c670ab366ca741c2dd4a9f50c07b39642a.tar.bz2 upstream-1e4f59c670ab366ca741c2dd4a9f50c07b39642a.zip | |
generic: upgrade to 3.14.34
Fixes several issues in the network stack.
Full changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.14.33
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.14.34
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 44594
Diffstat (limited to 'target/linux/generic/patches-3.14/074-bgmac-register-napi-before-the-device.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/074-bgmac-register-napi-before-the-device.patch | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/generic/patches-3.14/074-bgmac-register-napi-before-the-device.patch b/target/linux/generic/patches-3.14/074-bgmac-register-napi-before-the-device.patch index 2eba9eee82..aa45860e93 100644 --- a/target/linux/generic/patches-3.14/074-bgmac-register-napi-before-the-device.patch +++ b/target/linux/generic/patches-3.14/074-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 - |