You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
--- 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
|