[backfire] merge r24195

[10.03/openwrt.git] / target / linux / generic-2.6 / patches-2.6.30 / 300-ipv6_accept_ra_when_forwarding.patch

diff --git a/target/linux/generic-2.6/patches-2.6.30/300-ipv6_accept_ra_when_forwarding.patch b/target/linux/generic-2.6/patches-2.6.30/300-ipv6_accept_ra_when_forwarding.patch
new file mode 100644 (file)
index 0000000..b24ee99
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.30/300-ipv6_accept_ra_when_forwarding.patch
@@ -0,0 +1,30 @@
+--- a/net/ipv6/ndisc.c
++++ b/net/ipv6/ndisc.c
+@@ -1105,6 +1105,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);
+@@ -1150,7 +1162,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;
+       }