delete queue-3.10/ipv6-fix-backtracking-for-throw-routes.patch

diff --git a/queue-3.10/ipv6-fix-backtracking-for-throw-routes.patch b/queue-3.10/ipv6-fix-backtracking-for-throw-routes.patch
deleted file mode 100644 (file)
index 90683c1..0000000
--- a/queue-3.10/ipv6-fix-backtracking-for-throw-routes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From foo@baz Tue Mar 24 11:01:55 CET 2015
-From: Steven Barth <cyrus@openwrt.org>
-Date: Thu, 19 Mar 2015 16:16:04 +0100
-Subject: ipv6: fix backtracking for throw routes
-
-From: Steven Barth <cyrus@openwrt.org>
-
-[ Upstream commit 73ba57bfae4a1914f6a6dac71e3168dd900e00af ]
-
-for throw routes to trigger evaluation of other policy rules
-EAGAIN needs to be propagated up to fib_rules_lookup
-similar to how its done for IPv4
-
-A simple testcase for verification is:
-
-ip -6 rule add lookup 33333 priority 33333
-ip -6 route add throw 2001:db8::1
-ip -6 route add 2001:db8::1 via fe80::1 dev wlan0 table 33333
-ip route get 2001:db8::1
-
-Signed-off-by: Steven Barth <cyrus@openwrt.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/ipv6/fib6_rules.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/net/ipv6/fib6_rules.c
-+++ b/net/ipv6/fib6_rules.c
-@@ -97,6 +97,7 @@ static int fib6_rule_action(struct fib_r
-                               goto again;
-                       flp6->saddr = saddr;
-               }
-+              err = rt->dst.error;
-               goto out;
-       }
- again:

diff --git a/queue-3.10/series b/queue-3.10/series
index 61b3831c4b6e14a40121fa528a5d67c5cc6dee78..bd2f9e9070004b68c909109d3f15746ce6c785bf 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -10,7 +10,6 @@ inet_diag-fix-possible-overflow-in-inet_diag_dump_one_icsk.patch
 caif-fix-msg_oob-test-in-caif_seqpkt_recvmsg.patch
 rxrpc-bogus-msg_peek-test-in-rxrpc_recvmsg.patch
 revert-net-cx82310_eth-use-common-match-macro.patch
-ipv6-fix-backtracking-for-throw-routes.patch
 tcp-fix-tcp-fin-memory-accounting.patch
 net-compat-update-get_compat_msghdr-to-match-copy_msghdr_from_user-behaviour.patch
 tcp-make-connect-mem-charging-friendly.patch