From 312c05611b228d6d336364a2e10a53bb95e274ee Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 1 Feb 2021 10:35:34 +0100 Subject: kernel: bump 4.14 to 4.14.218 Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte --- .../layerscape/patches-4.14/202-core-linux-support-layerscape.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch') 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 e6a4dcd4a8..1216ce6967 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 @@ -837,7 +837,7 @@ Signed-off-by: Yangbo Lu --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -808,6 +808,32 @@ void napi_consume_skb(struct sk_buff *sk +@@ -812,6 +812,32 @@ void napi_consume_skb(struct sk_buff *sk } EXPORT_SYMBOL(napi_consume_skb); @@ -870,7 +870,7 @@ Signed-off-by: Yangbo Lu /* 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) < \ -@@ -1327,7 +1353,7 @@ static void skb_headers_offset_update(st +@@ -1331,7 +1357,7 @@ static void skb_headers_offset_update(st skb->inner_mac_header += off; } @@ -879,7 +879,7 @@ Signed-off-by: Yangbo Lu { __copy_skb_header(new, old); -@@ -1335,6 +1361,7 @@ static void copy_skb_header(struct sk_bu +@@ -1339,6 +1365,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; } -- cgit v1.2.3