1 files changed, 5 insertions, 4 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index e16129019c66..8f8a96ef9f3f 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -836,10 +836,10 @@ out:
 static __inline__ int neigh_max_probes(struct neighbour *n)
 {
         struct neigh_parms *p = n->parms;
-        return (n->nud_state & NUD_PROBE) ?
-                NEIGH_VAR(p, UCAST_PROBES) :
-                NEIGH_VAR(p, UCAST_PROBES) + NEIGH_VAR(p, APP_PROBES) +
-                NEIGH_VAR(p, MCAST_PROBES);
+        int max_probes = NEIGH_VAR(p, UCAST_PROBES) + NEIGH_VAR(p, APP_PROBES);
+        if (!(n->nud_state & NUD_PROBE))
+                max_probes += NEIGH_VAR(p, MCAST_PROBES);
+        return max_probes;
 }
 
 static void neigh_invalidate(struct neighbour *neigh)
@@ -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) {