aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches-4.4/0094-net-next-mediatek-don-t-use-intermediate-variables-t.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2016-06-20 23:26:13 +0200
committerZoltan HERPAI <wigyori@uid0.hu>2016-06-20 23:26:13 +0200
commit9d81678ab01a06ee718e33c2f2d3913cec684840 (patch)
tree29a5c4b2374b3f05652b496135257107ecb8765f /target/linux/mediatek/patches-4.4/0094-net-next-mediatek-don-t-use-intermediate-variables-t.patch
parent2dc1e11c688a439084692e0b86d20adc0310d42c (diff)
downloadmaster-187ad058-9d81678ab01a06ee718e33c2f2d3913cec684840.tar.gz
master-187ad058-9d81678ab01a06ee718e33c2f2d3913cec684840.tar.bz2
master-187ad058-9d81678ab01a06ee718e33c2f2d3913cec684840.zip
kernel: update kernel 4.4 to version 4.4.12
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/mediatek/patches-4.4/0094-net-next-mediatek-don-t-use-intermediate-variables-t.patch')
-rw-r--r--target/linux/mediatek/patches-4.4/0094-net-next-mediatek-don-t-use-intermediate-variables-t.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/mediatek/patches-4.4/0094-net-next-mediatek-don-t-use-intermediate-variables-t.patch b/target/linux/mediatek/patches-4.4/0094-net-next-mediatek-don-t-use-intermediate-variables-t.patch
index c45d7febb0..983d0c2712 100644
--- a/target/linux/mediatek/patches-4.4/0094-net-next-mediatek-don-t-use-intermediate-variables-t.patch
+++ b/target/linux/mediatek/patches-4.4/0094-net-next-mediatek-don-t-use-intermediate-variables-t.patch
@@ -15,8 +15,6 @@ Signed-off-by: John Crispin <john@phrozen.org>
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
-diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-index 6a9fbde..13ee15f 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -806,7 +806,7 @@ drop:
@@ -37,7 +35,7 @@ index 6a9fbde..13ee15f 100644
return done;
}
-@@ -977,28 +977,26 @@ static int mtk_poll_tx(struct mtk_eth *eth, int budget, bool *tx_again)
+@@ -977,28 +977,26 @@ static int mtk_poll_tx(struct mtk_eth *e
static int mtk_poll(struct napi_struct *napi, int budget)
{
struct mtk_eth *eth = container_of(napi, struct mtk_eth, rx_napi);
@@ -73,7 +71,7 @@ index 6a9fbde..13ee15f 100644
}
if (unlikely(netif_msg_intr(eth))) {
-@@ -1016,7 +1014,7 @@ static int mtk_poll(struct napi_struct *napi, int budget)
+@@ -1016,7 +1014,7 @@ static int mtk_poll(struct napi_struct *
return budget;
napi_complete(napi);
@@ -82,6 +80,3 @@ index 6a9fbde..13ee15f 100644
return rx_done;
}
---
-1.7.10.4
-