summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.14/721-phy_packets.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-05-28 12:09:41 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-03 12:43:17 +0200
commit6563e494a0fb1a5fd0537761b2751a7863e2450d (patch)
tree8765c6b67c9e3ae57147f413c541eb171113e68a /target/linux/generic/hack-4.14/721-phy_packets.patch
parente3408d09b0323e1cfea229543f6070f0b7cff97a (diff)
downloadopenwrt-6563e494a0fb1a5fd0537761b2751a7863e2450d.tar.gz
openwrt-6563e494a0fb1a5fd0537761b2751a7863e2450d.tar.bz2
openwrt-6563e494a0fb1a5fd0537761b2751a7863e2450d.zip
kernel: bump 4.14 to 4.14.122
Refreshed all patches. Compile-tested on: cns3xxx, imx6 Runtime-tested on: 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 e3c1c34a4f..6cbb25429f 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
-@@ -2512,6 +2512,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2514,6 +2514,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
-@@ -2642,16 +2646,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2645,16 +2649,6 @@ static inline struct sk_buff *dev_alloc_
}