[NET] NEIGHBOUR: Remove unpopular neigh_is_connected().
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Tue, 4 Mar 2008 05:55:03 +0000 (14:55 +0900)
committerYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Tue, 4 Mar 2008 06:18:23 +0000 (15:18 +0900)
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 <yoshfuji@linux-ipv6.org>
drivers/net/cxgb3/l2t.c
include/net/neighbour.h

index 865faee..f510140 100644 (file)
@@ -407,7 +407,7 @@ found:
                        } 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);
index ebbfb50..0622818 100644 (file)
@@ -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;