caskd/openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: backport mainlined bgmac patches from 3.19

Browse Source 
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 44410
This commit is contained in:
Rafał Miłecki 2015-02-11 17:35:09 +00:00
parent e3744a7cc7
commit e73ca898ab
4 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
target/linux/generic/patches-3.14/771-bgmac-register-napi-before-the-device.patch → target/linux/generic/patches-3.14/074-bgmac-register-napi-before-the-device.patch
View File

@ -1,18 +1,21 @@
From d5b4e70e8c205a67e2e246908b259367ab9ccecf Mon Sep 17 00:00:00 2001 From 6216642f200258708e47170ff14ba8ecb486f4f0 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de> From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon, 8 Dec 2014 08:27:23 +0100 Date: Sun, 18 Jan 2015 19:49:58 +0100
Subject: [PATCH 2/4] bgmac: register napi before the device Subject: [PATCH] bgmac: register napi before the device
napi should get registered before the netdev and not after. napi should get registered before the netdev and not after.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
--- ---
drivers/net/ethernet/broadcom/bgmac.c | 6 +++--- drivers/net/ethernet/broadcom/bgmac.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-) 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 --- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -1515,6 +1515,8 @@ static int bgmac_probe(struct bcma_devic @@ -1515,6 +1515,8 @@ static int bgmac_probe(struct bcma_device *core)
if (core->bus->sprom.boardflags_lo & BGMAC_BFL_ENETADM) if (core->bus->sprom.boardflags_lo & BGMAC_BFL_ENETADM)
bgmac_warn(bgmac, "Support for ADMtek ethernet switch not implemented\n"); bgmac_warn(bgmac, "Support for ADMtek ethernet switch not implemented\n");
@ -21,7 +24,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
err = bgmac_mii_register(bgmac); err = bgmac_mii_register(bgmac);
if (err) { if (err) {
bgmac_err(bgmac, "Cannot register MDIO\n"); bgmac_err(bgmac, "Cannot register MDIO\n");
@@ -1529,8 +1531,6 @@ static int bgmac_probe(struct bcma_devic @@ -1529,8 +1531,6 @@ static int bgmac_probe(struct bcma_device *core)
netif_carrier_off(net_dev); netif_carrier_off(net_dev);
@ -30,7 +33,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
return 0; return 0;
err_mii_unregister: err_mii_unregister:
@@ -1549,9 +1549,9 @@ static void bgmac_remove(struct bcma_dev @@ -1549,9 +1549,9 @@ static void bgmac_remove(struct bcma_device *core)
{ {
struct bgmac *bgmac = bcma_get_drvdata(core); struct bgmac *bgmac = bcma_get_drvdata(core);
@ -41,3 +44,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
bgmac_dma_free(bgmac); bgmac_dma_free(bgmac);
bcma_set_drvdata(core, NULL); bcma_set_drvdata(core, NULL);
free_netdev(bgmac->net_dev); free_netdev(bgmac->net_dev);
--
1.8.4.5

14
target/linux/generic/patches-3.14/772-bgmac-activate-irqs-only-if-there-is-nothing-to-poll.patch → target/linux/generic/patches-3.14/075-bgmac-activate-irqs-only-if-there-is-nothing-to-poll.patch
View File

@ -1,19 +1,22 @@
From fbd3b188fbaa861165a074c454d8f8dcf15343a0 Mon Sep 17 00:00:00 2001 From 43f159c60a99318b1ef7d1d7c16c4dfdd06bfd90 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de> From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon, 8 Dec 2014 08:47:10 +0100 Date: Sun, 18 Jan 2015 19:49:59 +0100
Subject: [PATCH 3/4] bgmac: activate irqs only if there is nothing to poll Subject: [PATCH] bgmac: activate irqs only if there is nothing to poll
IRQs should only get activated when there is nothing to poll in the IRQs should only get activated when there is nothing to poll in the
queue any more and to after every poll. queue any more and to after every poll.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
--- ---
drivers/net/ethernet/broadcom/bgmac.c | 6 +++--- drivers/net/ethernet/broadcom/bgmac.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index aa9f950..3007d95 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c --- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -1167,10 +1167,10 @@ static int bgmac_poll(struct napi_struct @@ -1167,10 +1167,10 @@ static int bgmac_poll(struct napi_struct *napi, int weight)
bgmac->int_status = 0; bgmac->int_status = 0;
} }
@ -27,3 +30,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
return handled; return handled;
} }
--
1.8.4.5

18
target/linux/generic/patches-3.18/771-bgmac-register-napi-before-the-device.patch → target/linux/generic/patches-3.18/070-bgmac-register-napi-before-the-device.patch
View File

@ -1,18 +1,21 @@
From d5b4e70e8c205a67e2e246908b259367ab9ccecf Mon Sep 17 00:00:00 2001 From 6216642f200258708e47170ff14ba8ecb486f4f0 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de> From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon, 8 Dec 2014 08:27:23 +0100 Date: Sun, 18 Jan 2015 19:49:58 +0100
Subject: [PATCH 2/4] bgmac: register napi before the device Subject: [PATCH] bgmac: register napi before the device
napi should get registered before the netdev and not after. napi should get registered before the netdev and not after.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
--- ---
drivers/net/ethernet/broadcom/bgmac.c | 6 +++--- drivers/net/ethernet/broadcom/bgmac.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-) 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 --- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -1515,6 +1515,8 @@ static int bgmac_probe(struct bcma_devic @@ -1515,6 +1515,8 @@ static int bgmac_probe(struct bcma_device *core)
if (core->bus->sprom.boardflags_lo & BGMAC_BFL_ENETADM) if (core->bus->sprom.boardflags_lo & BGMAC_BFL_ENETADM)
bgmac_warn(bgmac, "Support for ADMtek ethernet switch not implemented\n"); bgmac_warn(bgmac, "Support for ADMtek ethernet switch not implemented\n");
@ -21,7 +24,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
err = bgmac_mii_register(bgmac); err = bgmac_mii_register(bgmac);
if (err) { if (err) {
bgmac_err(bgmac, "Cannot register MDIO\n"); bgmac_err(bgmac, "Cannot register MDIO\n");
@@ -1529,8 +1531,6 @@ static int bgmac_probe(struct bcma_devic @@ -1529,8 +1531,6 @@ static int bgmac_probe(struct bcma_device *core)
netif_carrier_off(net_dev); netif_carrier_off(net_dev);
@ -30,7 +33,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
return 0; return 0;
err_mii_unregister: err_mii_unregister:
@@ -1549,9 +1549,9 @@ static void bgmac_remove(struct bcma_dev @@ -1549,9 +1549,9 @@ static void bgmac_remove(struct bcma_device *core)
{ {
struct bgmac *bgmac = bcma_get_drvdata(core); struct bgmac *bgmac = bcma_get_drvdata(core);
@ -41,3 +44,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
bgmac_dma_free(bgmac); bgmac_dma_free(bgmac);
bcma_set_drvdata(core, NULL); bcma_set_drvdata(core, NULL);
free_netdev(bgmac->net_dev); free_netdev(bgmac->net_dev);
--
1.8.4.5

14
target/linux/generic/patches-3.18/772-bgmac-activate-irqs-only-if-there-is-nothing-to-poll.patch → target/linux/generic/patches-3.18/071-bgmac-activate-irqs-only-if-there-is-nothing-to-poll.patch
View File

@ -1,19 +1,22 @@
From fbd3b188fbaa861165a074c454d8f8dcf15343a0 Mon Sep 17 00:00:00 2001 From 43f159c60a99318b1ef7d1d7c16c4dfdd06bfd90 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de> From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon, 8 Dec 2014 08:47:10 +0100 Date: Sun, 18 Jan 2015 19:49:59 +0100
Subject: [PATCH 3/4] bgmac: activate irqs only if there is nothing to poll Subject: [PATCH] bgmac: activate irqs only if there is nothing to poll
IRQs should only get activated when there is nothing to poll in the IRQs should only get activated when there is nothing to poll in the
queue any more and to after every poll. queue any more and to after every poll.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
--- ---
drivers/net/ethernet/broadcom/bgmac.c | 6 +++--- drivers/net/ethernet/broadcom/bgmac.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index aa9f950..3007d95 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c --- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -1167,10 +1167,10 @@ static int bgmac_poll(struct napi_struct @@ -1167,10 +1167,10 @@ static int bgmac_poll(struct napi_struct *napi, int weight)
bgmac->int_status = 0; bgmac->int_status = 0;
} }
@ -27,3 +30,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
return handled; return handled;
} }
--
1.8.4.5