aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-3.18/721-phy_packets.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2017-09-16 16:41:48 -0700
committerStijn Tintel <stijn@linux-ipv6.be>2017-09-18 02:08:18 +0300
commitbb83c9dcca9d7080a704e8a04a58ef37e11681fd (patch)
tree0b6f2bace2bed4b442c6b16fc206458715288257 /target/linux/generic/pending-3.18/721-phy_packets.patch
parent2375e279a7cb462d62fd6028cb3fbd56217222de (diff)
downloadupstream-bb83c9dcca9d7080a704e8a04a58ef37e11681fd.tar.gz
upstream-bb83c9dcca9d7080a704e8a04a58ef37e11681fd.tar.bz2
upstream-bb83c9dcca9d7080a704e8a04a58ef37e11681fd.zip
kernel: update to 3.18.71
Delete a bunch of fixes that are already included. Refresh patches. Compile-tested on malta/mipsel Runtime-tested on malta/mipsel Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-3.18/721-phy_packets.patch')
-rw-r--r--target/linux/generic/pending-3.18/721-phy_packets.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-3.18/721-phy_packets.patch b/target/linux/generic/pending-3.18/721-phy_packets.patch
index 99811c6242..7235ab355f 100644
--- a/target/linux/generic/pending-3.18/721-phy_packets.patch
+++ b/target/linux/generic/pending-3.18/721-phy_packets.patch
@@ -41,7 +41,7 @@
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -2054,6 +2054,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2055,6 +2055,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
@@ -52,7 +52,7 @@
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
-@@ -2180,16 +2184,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2181,16 +2185,6 @@ static inline struct sk_buff *dev_alloc_
}
@@ -86,7 +86,7 @@
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -2623,10 +2623,20 @@ static int xmit_one(struct sk_buff *skb,
+@@ -2626,10 +2626,20 @@ static int xmit_one(struct sk_buff *skb,
if (!list_empty(&ptype_all))
dev_queue_xmit_nit(skb, dev);
@@ -121,7 +121,7 @@
#include <net/protocol.h>
#include <net/dst.h>
-@@ -469,6 +470,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -471,6 +472,22 @@ struct sk_buff *__netdev_alloc_skb(struc
}
EXPORT_SYMBOL(__netdev_alloc_skb);