diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-18 11:58:32 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-19 10:01:57 +0200 |
commit | 6d682d82b02ae0eb4eba5186cdb9af521dd30249 (patch) | |
tree | 4f0e49ecc4a800c4eebbc89933fb4e4555b75694 /target/linux/generic/hack-4.9/721-phy_packets.patch | |
parent | 15a59e3e088c693cf7a654c31151149268b9a340 (diff) | |
download | upstream-6d682d82b02ae0eb4eba5186cdb9af521dd30249.tar.gz upstream-6d682d82b02ae0eb4eba5186cdb9af521dd30249.tar.bz2 upstream-6d682d82b02ae0eb4eba5186cdb9af521dd30249.zip |
kernel: bump 4.9 to 4.9.134
Refreshed all patches.
Compile-tested on: ar71xx, layerscape
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/hack-4.9/721-phy_packets.patch')
-rw-r--r-- | target/linux/generic/hack-4.9/721-phy_packets.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/hack-4.9/721-phy_packets.patch b/target/linux/generic/hack-4.9/721-phy_packets.patch index fbf3c70cac..b25fdec47a 100644 --- a/target/linux/generic/hack-4.9/721-phy_packets.patch +++ b/target/linux/generic/hack-4.9/721-phy_packets.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2334,6 +2334,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2339,6 +2339,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @skb: buffer to alter -@@ -2454,16 +2458,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2459,16 +2463,6 @@ static inline struct sk_buff *dev_alloc_ } @@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -2950,10 +2950,20 @@ static int xmit_one(struct sk_buff *skb, +@@ -2972,10 +2972,20 @@ static int xmit_one(struct sk_buff *skb, if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) dev_queue_xmit_nit(skb, dev); |