From 1f618cc5d297059f95793b18864d5261be3ff213 Mon Sep 17 00:00:00 2001 From: YOSHIFUJI Hideaki Date: Tue, 4 Mar 2008 14:55:03 +0900 Subject: [PATCH] --- yaml --- r: 89997 b: refs/heads/master c: 8082c37cdc31fb0ed178d9d706bf7568ada0edd9 h: refs/heads/master i: 89995: 0347ecafccefbf6fcc8bbdbc6bde0bd160967092 v: v3 --- [refs] | 2 +- trunk/drivers/net/cxgb3/l2t.c | 2 +- trunk/include/net/neighbour.h | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 3ccaab8461e0..d38d95e78cc8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e7b8dcd16eb91b9cd8ecc07c4094512f20d7e3c +refs/heads/master: 8082c37cdc31fb0ed178d9d706bf7568ada0edd9 diff --git a/trunk/drivers/net/cxgb3/l2t.c b/trunk/drivers/net/cxgb3/l2t.c index 865faee53e17..f510140885ae 100644 --- a/trunk/drivers/net/cxgb3/l2t.c +++ b/trunk/drivers/net/cxgb3/l2t.c @@ -407,7 +407,7 @@ void t3_l2t_update(struct t3cdev *dev, struct neighbour *neigh) } else if (neigh->nud_state & (NUD_CONNECTED|NUD_STALE)) setup_l2e_send_pending(dev, NULL, e); } else { - e->state = neigh_is_connected(neigh) ? + e->state = neigh->nud_state & NUD_CONNECTED ? L2T_STATE_VALID : L2T_STATE_STALE; if (memcmp(e->dmac, neigh->ha, 6)) setup_l2e_send_pending(dev, NULL, e); diff --git a/trunk/include/net/neighbour.h b/trunk/include/net/neighbour.h index ebbfb509822e..062281872064 100644 --- a/trunk/include/net/neighbour.h +++ b/trunk/include/net/neighbour.h @@ -284,12 +284,6 @@ static inline void neigh_confirm(struct neighbour *neigh) neigh->confirmed = jiffies; } -static inline int neigh_is_connected(struct neighbour *neigh) -{ - return neigh->nud_state&NUD_CONNECTED; -} - - static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb) { neigh->used = jiffies;