diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-17 02:26:00 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-17 02:26:00 +0200 |
| commit | 05e3aa0949c138803185f92bd7db9be59cfca1be (patch) | |
| tree | 8ea4dd1ab94160dfe51d3d0c0d305d20f2a62a04 /net/ipv4 | |
| parent | ipv6: Use calculated 'neigh' instead of re-evaluating dst->neighbour (diff) | |
| download | linux-05e3aa0949c138803185f92bd7db9be59cfca1be.tar.xz linux-05e3aa0949c138803185f92bd7db9be59cfca1be.zip | |
net: Create and use new helper, neigh_output().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_output.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 1ac674a68c77..db296a98b236 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -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); |