diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-01-25 23:17:22 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-01-25 23:18:42 +0100 |
commit | 2ecb22dc51a501ae619d183283bc7766f5c4fe76 (patch) | |
tree | e336e600eca0ea6859b455b36de0067a280c2294 /target/linux/generic/hack-4.14 | |
parent | 11f4918ebb32f658e419225ef218f82d66b482cc (diff) | |
download | upstream-2ecb22dc51a501ae619d183283bc7766f5c4fe76.tar.gz upstream-2ecb22dc51a501ae619d183283bc7766f5c4fe76.tar.bz2 upstream-2ecb22dc51a501ae619d183283bc7766f5c4fe76.zip |
kernel: bump 4.14 to 4.14.217
Refreshed all patches.
Compile-tested on: ipq40xx, lantiq/xrx200, x86/64, ipq806x
Runtime-tested on: ipq40xx, lantiq/xrx200, x86/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/hack-4.14')
-rw-r--r-- | target/linux/generic/hack-4.14/721-phy_packets.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/hack-4.14/721-phy_packets.patch b/target/linux/generic/hack-4.14/721-phy_packets.patch index 93d63534eb..cd10a3d6cb 100644 --- a/target/linux/generic/hack-4.14/721-phy_packets.patch +++ b/target/linux/generic/hack-4.14/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 -@@ -2544,6 +2544,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2560,6 +2560,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 -@@ -2675,16 +2679,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2691,16 +2695,6 @@ static inline struct sk_buff *dev_alloc_ } @@ -136,7 +136,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #include <net/protocol.h> #include <net/dst.h> -@@ -503,6 +504,22 @@ skb_fail: +@@ -508,6 +509,22 @@ skb_fail: } EXPORT_SYMBOL(__napi_alloc_skb); |