[NET] NEIGHBOUR: Remove unpopular neigh_is_connected().

neigh_is_connected() is not popular at all, and the only user drivers/net/cxgb3/l2t.c:t3_l2t_update() also have raw (expanded) expression. Let's expand it and remove the inline function. Signed-off-by: YOSHIFUJI Hideaki <[email protected]>
cxl-micron-reskit · Mar 4, 2008 · 8082c37 · 8082c37
1 parent 0e7b8dc
commit 8082c37
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/drivers/net/cxgb3/l2t.c b/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/include/net/neighbour.h b/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;