diff --git a/[refs] b/[refs] index a261676332d0..20bb2349299d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2221f308dabb95abb914ad858d36c2462705558 +refs/heads/master: 9e3be4b34364a670bd6e57d2e8c3caabdd8d89f8 diff --git a/trunk/net/ipv6/ndisc.c b/trunk/net/ipv6/ndisc.c index 0358e6066a4e..73a894a2152c 100644 --- a/trunk/net/ipv6/ndisc.c +++ b/trunk/net/ipv6/ndisc.c @@ -736,7 +736,7 @@ static void ndisc_recv_ns(struct sk_buff *skb) * so fail our DAD process */ addrconf_dad_failure(ifp); - goto out; + return; } else { /* * This is not a dad solicitation.