aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.14/721-phy_packets.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-01-04 23:52:01 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2020-01-05 00:43:33 +0100
commit1bb90a28e47ce7cf3ae76f46b43a6f5e0da2a055 (patch)
treeffc0eedf64b904780a6c98c8afaef5d265de08aa /target/linux/generic/hack-4.14/721-phy_packets.patch
parent663b1a14e59074a23b86237e0b13dc6e78a6e50b (diff)
downloadupstream-1bb90a28e47ce7cf3ae76f46b43a6f5e0da2a055.tar.gz
upstream-1bb90a28e47ce7cf3ae76f46b43a6f5e0da2a055.tar.bz2
upstream-1bb90a28e47ce7cf3ae76f46b43a6f5e0da2a055.zip
kernel: bump 4.14 to 4.14.162
Refreshed all patches. Compile-tested on: ramips Runtime-tested on: ramips Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 2c59e837af..52910fceeb 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
-@@ -2530,6 +2530,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2532,6 +2532,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
-@@ -2661,16 +2665,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2663,16 +2667,6 @@ static inline struct sk_buff *dev_alloc_
}