neigh: Kill hh_cache->hh_output
It's just taking on one of two possible values, either neigh_ops->output or dev_queue_xmit(). And this is purely depending upon whether nud_state has NUD_CONNECTED set or not. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -340,13 +340,13 @@ static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb)
|
||||
} while (read_seqretry(&hh->hh_lock, seq));
|
||||
|
||||
skb_push(skb, hh_len);
|
||||
return hh->hh_output(skb);
|
||||
return dev_queue_xmit(skb);
|
||||
}
|
||||
|
||||
static inline int neigh_output(struct neighbour *n, struct sk_buff *skb)
|
||||
{
|
||||
struct hh_cache *hh = &n->hh;
|
||||
if (hh->hh_len)
|
||||
if ((n->nud_state & NUD_CONNECTED) && hh->hh_len)
|
||||
return neigh_hh_output(hh, skb);
|
||||
else
|
||||
return n->output(skb);
|
||||
|
Reference in New Issue
Block a user