diff options
-rw-r--r-- | drivers/net/cxgb3/l2t.c | 2 | ||||
-rw-r--r-- | include/net/neighbour.h | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/cxgb3/l2t.c b/drivers/net/cxgb3/l2t.c index 865faee53e17..f510140885ae 100644 --- a/drivers/net/cxgb3/l2t.c +++ b/drivers/net/cxgb3/l2t.c | |||
@@ -407,7 +407,7 @@ found: | |||
407 | } else if (neigh->nud_state & (NUD_CONNECTED|NUD_STALE)) | 407 | } else if (neigh->nud_state & (NUD_CONNECTED|NUD_STALE)) |
408 | setup_l2e_send_pending(dev, NULL, e); | 408 | setup_l2e_send_pending(dev, NULL, e); |
409 | } else { | 409 | } else { |
410 | e->state = neigh_is_connected(neigh) ? | 410 | e->state = neigh->nud_state & NUD_CONNECTED ? |
411 | L2T_STATE_VALID : L2T_STATE_STALE; | 411 | L2T_STATE_VALID : L2T_STATE_STALE; |
412 | if (memcmp(e->dmac, neigh->ha, 6)) | 412 | if (memcmp(e->dmac, neigh->ha, 6)) |
413 | setup_l2e_send_pending(dev, NULL, e); | 413 | setup_l2e_send_pending(dev, NULL, e); |
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index ebbfb509822e..062281872064 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h | |||
@@ -284,12 +284,6 @@ static inline void neigh_confirm(struct neighbour *neigh) | |||
284 | neigh->confirmed = jiffies; | 284 | neigh->confirmed = jiffies; |
285 | } | 285 | } |
286 | 286 | ||
287 | static inline int neigh_is_connected(struct neighbour *neigh) | ||
288 | { | ||
289 | return neigh->nud_state&NUD_CONNECTED; | ||
290 | } | ||
291 | |||
292 | |||
293 | static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb) | 287 | static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb) |
294 | { | 288 | { |
295 | neigh->used = jiffies; | 289 | neigh->used = jiffies; |