Author: rmilecki
Date: 2016-03-30 18:43:25 +0200 (Wed, 30 Mar 2016)
New Revision: 49097
Modified:
branches/chaos_calmer/include/kernel-version.mk
branches/chaos_calmer/target/linux/generic/patches-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch
branches/chaos_calmer/target/linux/generic/patches-3.18/532-jffs2_eofdetect.patch
branches/chaos_calmer/target/linux/generic/patches-3.18/667-ipv6-Fixed-source-specific-default-route-handling.patch
Log:
kernel: update kernel 3.18 to version 3.18.29
Signed-off-by: Rafa{U+0142} Mi{U+0142}ecki <[email protected]>
Backport of r49096
Modified: branches/chaos_calmer/include/kernel-version.mk
===================================================================
--- branches/chaos_calmer/include/kernel-version.mk 2016-03-30 16:41:26 UTC
(rev 49096)
+++ branches/chaos_calmer/include/kernel-version.mk 2016-03-30 16:43:25 UTC
(rev 49097)
@@ -2,9 +2,9 @@
LINUX_RELEASE?=1
-LINUX_VERSION-3.18 = .27
+LINUX_VERSION-3.18 = .29
-LINUX_KERNEL_MD5SUM-3.18.27 = 015a01bf84e7c6bc9952551b4da45044
+LINUX_KERNEL_MD5SUM-3.18.29 = b25737a0bc98e80d12200de93f239c28
ifdef KERNEL_PATCHVER
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
Modified:
branches/chaos_calmer/target/linux/generic/patches-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch
===================================================================
---
branches/chaos_calmer/target/linux/generic/patches-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch
2016-03-30 16:41:26 UTC (rev 49096)
+++
branches/chaos_calmer/target/linux/generic/patches-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch
2016-03-30 16:43:25 UTC (rev 49097)
@@ -44,7 +44,7 @@
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
-@@ -594,20 +594,22 @@ int ip6_fragment(struct sk_buff *skb, in
+@@ -597,20 +597,22 @@ int ip6_fragment(struct sk_buff *skb, in
}
mtu -= hlen + sizeof(struct frag_hdr);
@@ -69,7 +69,7 @@
goto slow_path_clean;
/* Partially cloned skb? */
-@@ -624,8 +626,6 @@ int ip6_fragment(struct sk_buff *skb, in
+@@ -627,8 +629,6 @@ int ip6_fragment(struct sk_buff *skb, in
err = 0;
offset = 0;
@@ -78,7 +78,7 @@
/* BUILD HEADER */
*prevhdr = NEXTHDR_FRAGMENT;
-@@ -633,8 +633,11 @@ int ip6_fragment(struct sk_buff *skb, in
+@@ -636,8 +636,11 @@ int ip6_fragment(struct sk_buff *skb, in
if (!tmp_hdr) {
IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
IPSTATS_MIB_FRAGFAILS);
@@ -91,7 +91,7 @@
__skb_pull(skb, hlen);
fh = (struct frag_hdr *)__skb_push(skb, sizeof(struct
frag_hdr));
-@@ -732,7 +735,6 @@ slow_path:
+@@ -735,7 +738,6 @@ slow_path:
*/
*prevhdr = NEXTHDR_FRAGMENT;
Modified:
branches/chaos_calmer/target/linux/generic/patches-3.18/532-jffs2_eofdetect.patch
===================================================================
---
branches/chaos_calmer/target/linux/generic/patches-3.18/532-jffs2_eofdetect.patch
2016-03-30 16:41:26 UTC (rev 49096)
+++
branches/chaos_calmer/target/linux/generic/patches-3.18/532-jffs2_eofdetect.patch
2016-03-30 16:43:25 UTC (rev 49097)
@@ -1,6 +1,6 @@
--- a/fs/jffs2/build.c
+++ b/fs/jffs2/build.c
-@@ -114,6 +114,16 @@ static int jffs2_build_filesystem(struct
+@@ -116,6 +116,16 @@ static int jffs2_build_filesystem(struct
dbg_fsbuild("scanned flash completely\n");
jffs2_dbg_dump_block_lists_nolock(c);
Modified:
branches/chaos_calmer/target/linux/generic/patches-3.18/667-ipv6-Fixed-source-specific-default-route-handling.patch
===================================================================
---
branches/chaos_calmer/target/linux/generic/patches-3.18/667-ipv6-Fixed-source-specific-default-route-handling.patch
2016-03-30 16:41:26 UTC (rev 49096)
+++
branches/chaos_calmer/target/linux/generic/patches-3.18/667-ipv6-Fixed-source-specific-default-route-handling.patch
2016-03-30 16:43:25 UTC (rev 49097)
@@ -26,7 +26,7 @@
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
-@@ -900,21 +900,45 @@ static int ip6_dst_lookup_tail(struct so
+@@ -903,21 +903,45 @@ static int ip6_dst_lookup_tail(struct so
#endif
int err;
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
