diff options
| author | Mister Oyster <oysterized@gmail.com> | 2017-02-24 19:01:08 +0100 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-11 10:59:46 +0200 |
| commit | d547e0f39015f8e8ec1dba8bd9d66c1beb24eb41 (patch) | |
| tree | b3a2a6e3eec88c4885bf12a0074748926013bb30 /net | |
| parent | e8ffd61e293c240372e3d40c28f1719c4f4a9f85 (diff) | |
net: fix merge error
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/addrconf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index ffe7c4656..41f4f7767 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -3273,6 +3273,7 @@ static void addrconf_rs_timer(unsigned long data) idev->cnf.rtr_solicit_delay : idev->cnf.rtr_solicit_interval); } else { + inet6_no_ra_notify(RTM_NORA,idev); /* * Note: we do not support deprecated "all on-link" * assumption any longer. |