aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-02-25 11:38:23 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-02-25 17:33:16 +0100
commitceed0665cc68ee836806b0cc7ca496a858063ce2 (patch)
treed09ed25cbbbebe49bfecaa78560647e06b3eb661 /target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
parent151d806c7898bf5a7fb69910c82bf06522955725 (diff)
downloadupstream-ceed0665cc68ee836806b0cc7ca496a858063ce2.tar.gz
upstream-ceed0665cc68ee836806b0cc7ca496a858063ce2.tar.bz2
upstream-ceed0665cc68ee836806b0cc7ca496a858063ce2.zip
kernel: bump 4.14 to 4.14.103
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/layerscape/patches-4.14/202-core-linux-support-layerscape.patch')
-rw-r--r--target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
index a5a5f8b29a..c3e63003dd 100644
--- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
@@ -522,7 +522,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
}
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
-@@ -799,6 +799,32 @@ void napi_consume_skb(struct sk_buff *sk
+@@ -803,6 +803,32 @@ void napi_consume_skb(struct sk_buff *sk
}
EXPORT_SYMBOL(napi_consume_skb);
@@ -555,7 +555,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
/* Make sure a field is enclosed inside headers_start/headers_end section */
#define CHECK_SKB_FIELD(field) \
BUILD_BUG_ON(offsetof(struct sk_buff, field) < \
-@@ -1318,7 +1344,7 @@ static void skb_headers_offset_update(st
+@@ -1322,7 +1348,7 @@ static void skb_headers_offset_update(st
skb->inner_mac_header += off;
}
@@ -564,7 +564,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
{
__copy_skb_header(new, old);
-@@ -1326,6 +1352,7 @@ static void copy_skb_header(struct sk_bu
+@@ -1330,6 +1356,7 @@ static void copy_skb_header(struct sk_bu
skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs;
skb_shinfo(new)->gso_type = skb_shinfo(old)->gso_type;
}