luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Create and use new helper, neigh_output().

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2011-07-16 17:26:00 -07:00
parent a29282972c
commit 05e3aa0949
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/net/neighbour.h
View File

@ -344,6 +344,15 @@ static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb)
return hh->hh_output(skb);
}
static inline int neigh_output(struct neighbour *n, struct sk_buff *skb)
{
struct hh_cache *hh = &n->hh;
if (hh->hh_len)
return neigh_hh_output(hh, skb);
else
return n->output(skb);
}
static inline struct neighbour *
__neigh_lookup(struct neigh_table *tbl, const void *pkey, struct net_device *dev, int creat)
{

10
net/ipv4/ip_output.c
View File

@ -205,13 +205,9 @@ static inline int ip_finish_output2(struct sk_buff *skb)
}
neigh = dst->neighbour;
if (neigh) {
struct hh_cache *hh = &neigh->hh;
if (hh->hh_len)
return neigh_hh_output(hh, skb);
else
return neigh->output(skb);
}
if (neigh)
return neigh_output(neigh, skb);
if (net_ratelimit())
printk(KERN_DEBUG "ip_finish_output2: No header cache and no neighbour!\n");
kfree_skb(skb);

10
net/ipv6/ip6_output.c
View File

@ -136,13 +136,9 @@ static int ip6_finish_output2(struct sk_buff *skb)
}
neigh = dst->neighbour;
if (neigh) {
struct hh_cache *hh = &neigh->hh;
if (hh->hh_len)
return neigh_hh_output(hh, skb);
else
return neigh->output(skb);
}
if (neigh)
return neigh_output(neigh, skb);
IP6_INC_STATS_BH(dev_net(dst->dev),
ip6_dst_idev(dst), IPSTATS_MIB_OUTNOROUTES);
kfree_skb(skb);