1 files changed, 0 insertions, 30 deletions
diff --git a/target/linux/generic/patches-2.6.31/300-ipv6_accept_ra_when_forwarding.patch b/target/linux/generic/patches-2.6.31/300-ipv6_accept_ra_when_forwarding.patch
deleted file mode 100644
index 9e7d093918..0000000000
--- a/target/linux/generic/patches-2.6.31/300-ipv6_accept_ra_when_forwarding.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/net/ipv6/ndisc.c
-+++ b/net/ipv6/ndisc.c
-@@ -1106,6 +1106,18 @@ errout:
- 	rtnl_set_sk_err(net, RTNLGRP_ND_USEROPT, err);
- }
- 
-+static inline int accept_ra(struct inet6_dev *in6_dev)
-+{
-+	/*
-+	 * If forwarding is enabled, RA are not accepted unless the special
-+	 * hybrid mode (accept_ra=2) is enabled.
-+	 */
-+	if (in6_dev->cnf.forwarding && in6_dev->cnf.accept_ra < 2)
-+		return 0;
-+
-+	return in6_dev->cnf.accept_ra;
-+}
-+
- static void ndisc_router_discovery(struct sk_buff *skb)
- {
- 	struct ra_msg *ra_msg = (struct ra_msg *)skb_transport_header(skb);
-@@ -1151,7 +1163,7 @@ static void ndisc_router_discovery(struc
- 			   skb->dev->name);
- 		return;
- 	}
--	if (in6_dev->cnf.forwarding || !in6_dev->cnf.accept_ra) {
-+	if (!accept_ra(in6_dev)) {
- 		in6_dev_put(in6_dev);
- 		return;
- 	}