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.
31 lines
789 B
Diff
31 lines
789 B
Diff
--- 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;
|
|
}
|