aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.14/721-phy_packets.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-10-07 16:53:22 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-10-12 09:45:54 +0200
commit9c718b5478ac5df8ca4f27dbb70a6201c385aada (patch)
treee73b499786367a1f7b65a20cea640a09ac8e678f /target/linux/generic/hack-4.14/721-phy_packets.patch
parentb21bea7b1b92abefad53bcfe509b7e44dd488c79 (diff)
downloadupstream-9c718b5478ac5df8ca4f27dbb70a6201c385aada.tar.gz
upstream-9c718b5478ac5df8ca4f27dbb70a6201c385aada.tar.bz2
upstream-9c718b5478ac5df8ca4f27dbb70a6201c385aada.zip
kernel: bump 4.14 to 4.14.200
Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/hack-4.14/721-phy_packets.patch')
-rw-r--r--target/linux/generic/hack-4.14/721-phy_packets.patch4
1 files changed, 2 insertions, 2 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 e6e06554de..93d63534eb 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
-@@ -2532,6 +2532,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2544,6 +2544,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
-@@ -2663,16 +2667,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2675,16 +2679,6 @@ static inline struct sk_buff *dev_alloc_
}