diff options
| author | YOSHIFUJI Hideaki | 2008-03-04 06:55:03 +0100 |
|---|---|---|
| committer | YOSHIFUJI Hideaki | 2008-03-04 07:18:23 +0100 |
| commit | 8082c37cdc31fb0ed178d9d706bf7568ada0edd9 (patch) | |
| tree | c17ec16dba86b96e53bfe23bd84114a7f963a7da | |
| parent | [IPV6]: Use htonl() instead of __constant_htonl() where appricable. (diff) | |
| download | kernel-qcow2-linux-8082c37cdc31fb0ed178d9d706bf7568ada0edd9.tar.gz kernel-qcow2-linux-8082c37cdc31fb0ed178d9d706bf7568ada0edd9.tar.xz kernel-qcow2-linux-8082c37cdc31fb0ed178d9d706bf7568ada0edd9.zip | |
[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 <yoshfuji@linux-ipv6.org>
| -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: } 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 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) 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; |