summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDuan Jiong <duanj.fnst@cn.fujitsu.com>2014-02-27 10:03:03 +0100
committerDavid S. Miller <davem@davemloft.net>2014-02-27 22:40:38 +0100
commit5e2c21dceb5d324b204fda1f28270bb3dbccedb3 (patch)
tree9c375e2bc688476d52ca3acc188d275eff2230df /net/core
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse... (diff)
downloadlinux-5e2c21dceb5d324b204fda1f28270bb3dbccedb3.tar.xz
linux-5e2c21dceb5d324b204fda1f28270bb3dbccedb3.zip
neigh: directly goto out after setting nud_state to NUD_FAILED
Because those following if conditions will not be matched. Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/neighbour.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 36d3f8c1a2dd..fbde4e3ce802 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -945,6 +945,7 @@ static void neigh_timer_handler(unsigned long arg)
neigh->nud_state = NUD_FAILED;
notify = 1;
neigh_invalidate(neigh);
+ goto out;
}
if (neigh->nud_state & NUD_IN_TIMER) {