aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2018-06-01 01:37:51 +0200
committerDaniel Golle <daniel@makrotopia.org>2018-06-01 01:37:51 +0200
commit2087df1c6d38333aa1d8f87eb7b29a85b5863bd5 (patch)
treed5b01890b8152d1ea74dc9cd894700b01c18d564
parentdaa73b63d5dc5eb264341336c0d7cd64d750664d (diff)
downloadupstream-2087df1c6d38333aa1d8f87eb7b29a85b5863bd5.tar.gz
upstream-2087df1c6d38333aa1d8f87eb7b29a85b5863bd5.tar.bz2
upstream-2087df1c6d38333aa1d8f87eb7b29a85b5863bd5.zip
Revert "kernel: backport export ipv6_push_frag_opts for tunneling now"
This reverts commit daa73b63d5dc5eb264341336c0d7cd64d750664d. The fix has already been imported by commit b7735d8113 ("kernel: import follow-up fix for previous backport"). The patch won't apply twice. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-rw-r--r--target/linux/generic/backport-4.9/094-v4.12-0002-ipv6-Need-to-export-ipv6_push_frag_opts-for-tunnelin.patch31
-rw-r--r--target/linux/generic/backport-4.9/094-v4.12-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch (renamed from target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch)0
2 files changed, 0 insertions, 31 deletions
diff --git a/target/linux/generic/backport-4.9/094-v4.12-0002-ipv6-Need-to-export-ipv6_push_frag_opts-for-tunnelin.patch b/target/linux/generic/backport-4.9/094-v4.12-0002-ipv6-Need-to-export-ipv6_push_frag_opts-for-tunnelin.patch
deleted file mode 100644
index d102e7bb85..0000000000
--- a/target/linux/generic/backport-4.9/094-v4.12-0002-ipv6-Need-to-export-ipv6_push_frag_opts-for-tunnelin.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5b8481fa42ac58484d633b558579e302aead64c1 Mon Sep 17 00:00:00 2001
-From: "David S. Miller" <davem@davemloft.net>
-Date: Mon, 1 May 2017 15:10:20 -0400
-Subject: [PATCH] ipv6: Need to export ipv6_push_frag_opts for tunneling now.
-
-Since that change also made the nfrag function not necessary
-for exports, remove it.
-
-Fixes: 89a23c8b528b ("ip6_tunnel: Fix missing tunnel encapsulation limit option")
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/ipv6/exthdrs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/ipv6/exthdrs.c
-+++ b/net/ipv6/exthdrs.c
-@@ -729,13 +729,13 @@ void ipv6_push_nfrag_opts(struct sk_buff
- if (opt->hopopt)
- ipv6_push_exthdr(skb, proto, NEXTHDR_HOP, opt->hopopt);
- }
--EXPORT_SYMBOL(ipv6_push_nfrag_opts);
-
- void ipv6_push_frag_opts(struct sk_buff *skb, struct ipv6_txoptions *opt, u8 *proto)
- {
- if (opt->dst1opt)
- ipv6_push_exthdr(skb, proto, NEXTHDR_DEST, opt->dst1opt);
- }
-+EXPORT_SYMBOL(ipv6_push_frag_opts);
-
- struct ipv6_txoptions *
- ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt)
diff --git a/target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch b/target/linux/generic/backport-4.9/094-v4.12-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch
index 0ccbacf3d0..0ccbacf3d0 100644
--- a/target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch
+++ b/target/linux/generic/backport-4.9/094-v4.12-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch