---

yaml --- r: 89997 b: refs/heads/master c: 8082c37 h: refs/heads/master i: 89995: 0347eca v: v3
git-mirror · Mar 4, 2008 · 1f618cc · 1f618cc
1 parent 466eba1
commit 1f618cc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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;