diff options
| -rw-r--r-- | net/ipv6/ndisc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index a845e3d2057e..b7ece278dd49 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
| @@ -1151,9 +1151,9 @@ static void ndisc_router_discovery(struct sk_buff *skb) | |||
| 1151 | /* Do not accept RA with source-addr found on local machine unless | 1151 | /* Do not accept RA with source-addr found on local machine unless |
| 1152 | * accept_ra_from_local is set to true. | 1152 | * accept_ra_from_local is set to true. |
| 1153 | */ | 1153 | */ |
| 1154 | if (!(in6_dev->cnf.accept_ra_from_local || | 1154 | if (!in6_dev->cnf.accept_ra_from_local && |
| 1155 | ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr, | 1155 | ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr, |
| 1156 | NULL, 0))) { | 1156 | NULL, 0)) { |
| 1157 | ND_PRINTK(2, info, | 1157 | ND_PRINTK(2, info, |
| 1158 | "RA from local address detected on dev: %s: default router ignored\n", | 1158 | "RA from local address detected on dev: %s: default router ignored\n", |
| 1159 | skb->dev->name); | 1159 | skb->dev->name); |
| @@ -1294,9 +1294,9 @@ skip_linkparms: | |||
| 1294 | } | 1294 | } |
| 1295 | 1295 | ||
| 1296 | #ifdef CONFIG_IPV6_ROUTE_INFO | 1296 | #ifdef CONFIG_IPV6_ROUTE_INFO |
| 1297 | if (!(in6_dev->cnf.accept_ra_from_local || | 1297 | if (!in6_dev->cnf.accept_ra_from_local && |
| 1298 | ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr, | 1298 | ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr, |
| 1299 | NULL, 0))) { | 1299 | NULL, 0)) { |
| 1300 | ND_PRINTK(2, info, | 1300 | ND_PRINTK(2, info, |
| 1301 | "RA from local address detected on dev: %s: router info ignored.\n", | 1301 | "RA from local address detected on dev: %s: router info ignored.\n", |
| 1302 | skb->dev->name); | 1302 | skb->dev->name); |