aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/077-05-bgmac-leave-interrupts-disabled-as-long-as-there-is-.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-04-14 12:17:20 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-04-14 12:17:20 +0000
commit5c9c6706165d3ce7276eed2c557089aa690c6529 (patch)
treea2dd8347d61e31d94dd0bd801720d6001983b43d /target/linux/generic/patches-3.18/077-05-bgmac-leave-interrupts-disabled-as-long-as-there-is-.patch
parentcd4fd05648194a252a560876742acab461f4ec8e (diff)
downloadupstream-5c9c6706165d3ce7276eed2c557089aa690c6529.tar.gz
upstream-5c9c6706165d3ce7276eed2c557089aa690c6529.tar.bz2
upstream-5c9c6706165d3ce7276eed2c557089aa690c6529.zip
kernel: update bgmac patches to the latest version submitted
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 45431
Diffstat (limited to 'target/linux/generic/patches-3.18/077-05-bgmac-leave-interrupts-disabled-as-long-as-there-is-.patch')
-rw-r--r--target/linux/generic/patches-3.18/077-05-bgmac-leave-interrupts-disabled-as-long-as-there-is-.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.18/077-05-bgmac-leave-interrupts-disabled-as-long-as-there-is-.patch b/target/linux/generic/patches-3.18/077-05-bgmac-leave-interrupts-disabled-as-long-as-there-is-.patch
index 7118d0d145..3bbe9ea9cb 100644
--- a/target/linux/generic/patches-3.18/077-05-bgmac-leave-interrupts-disabled-as-long-as-there-is-.patch
+++ b/target/linux/generic/patches-3.18/077-05-bgmac-leave-interrupts-disabled-as-long-as-there-is-.patch
@@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1105,8 +1105,6 @@ static void bgmac_chip_reset(struct bgma
+@@ -1109,8 +1109,6 @@ static void bgmac_chip_reset(struct bgma
bgmac_phy_init(bgmac);
netdev_reset_queue(bgmac->net_dev);
@@ -24,7 +24,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
}
static void bgmac_chip_intrs_on(struct bgmac *bgmac)
-@@ -1221,14 +1219,13 @@ static irqreturn_t bgmac_interrupt(int i
+@@ -1225,14 +1223,13 @@ static irqreturn_t bgmac_interrupt(int i
if (!int_status)
return IRQ_NONE;
@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
napi_schedule(&bgmac->napi);
return IRQ_HANDLED;
-@@ -1237,25 +1234,17 @@ static irqreturn_t bgmac_interrupt(int i
+@@ -1241,25 +1238,17 @@ static irqreturn_t bgmac_interrupt(int i
static int bgmac_poll(struct napi_struct *napi, int weight)
{
struct bgmac *bgmac = container_of(napi, struct bgmac, napi);