Merge "net: core: To send ARP probe when neighbor state is NUD_STALE"

This commit is contained in:
Linux Build Service Account 2016-06-15 15:41:53 -07:00 committed by Gerrit - the friendly Code Review server
commit 05e33e162f
1 changed files with 5 additions and 1 deletions

View File

@ -950,7 +950,11 @@ static void neigh_timer_handler(unsigned long arg)
if (!mod_timer(&neigh->timer, next))
neigh_hold(neigh);
}
if (neigh->nud_state & (NUD_INCOMPLETE | NUD_PROBE | NUD_STALE)) {
if (neigh_probe_enable) {
if (neigh->nud_state & (NUD_INCOMPLETE | NUD_PROBE | NUD_STALE))
neigh_probe(neigh);
} else if (neigh->nud_state & (NUD_INCOMPLETE | NUD_PROBE)) {
neigh_probe(neigh);
} else {
out: