From 2fe5c1d12470049c95b2c9c7f6dc22ddbc343b9c Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 30 Nov 2010 01:52:51 +0000 Subject: backport two changes from kernel.org: 65e9b62d4503849b10bedfc29bff0473760cc597 ipv6: add special mode accept_ra=2 to accept RA while configured as router c3bccac2fa76f1619dfe4fb7b9bee69de7f066d8 ipv6: add special mode forwarding=2 to send RS while configured as router SVN-Revision: 24195 --- .../300-ipv6_accept_ra_when_forwarding.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 target/linux/generic/patches-2.6.34/300-ipv6_accept_ra_when_forwarding.patch (limited to 'target/linux/generic/patches-2.6.34/300-ipv6_accept_ra_when_forwarding.patch') diff --git a/target/linux/generic/patches-2.6.34/300-ipv6_accept_ra_when_forwarding.patch b/target/linux/generic/patches-2.6.34/300-ipv6_accept_ra_when_forwarding.patch new file mode 100644 index 0000000000..265ae6b2b8 --- /dev/null +++ b/target/linux/generic/patches-2.6.34/300-ipv6_accept_ra_when_forwarding.patch @@ -0,0 +1,41 @@ +--- a/net/ipv6/ndisc.c ++++ b/net/ipv6/ndisc.c +@@ -1107,6 +1107,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); +@@ -1160,8 +1172,7 @@ static void ndisc_router_discovery(struc + return; + } + +- /* skip route and link configuration on routers */ +- if (in6_dev->cnf.forwarding || !in6_dev->cnf.accept_ra) ++ if (!accept_ra(in6_dev)) + goto skip_linkparms; + + #ifdef CONFIG_IPV6_NDISC_NODETYPE +@@ -1311,8 +1322,7 @@ skip_linkparms: + NEIGH_UPDATE_F_ISROUTER); + } + +- /* skip route and link configuration on routers */ +- if (in6_dev->cnf.forwarding || !in6_dev->cnf.accept_ra) ++ if (!accept_ra(in6_dev)) + goto out; + + #ifdef CONFIG_IPV6_ROUTE_INFO -- cgit v1.2.3