leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

neigh: Don't require a dst in neigh_resolve_output

Browse Source 
Having a dst helps a little bit for teql but is fundamentally
unnecessary and there are code paths where a dst is not available that
it would be nice to use the neighbour cache.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric W. Biederman
2015-03-02 00:14:14 -06:00
committed by David S. Miller
parent bdf53c5849
commit 435e8eb27e
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/core/neighbour.c
View File

@@ -1284,12 +1284,8 @@ static void neigh_hh_init(struct neighbour *n)
int neigh_resolve_output(struct neighbour *neigh, struct sk_buff *skb) int neigh_resolve_output(struct neighbour *neigh, struct sk_buff *skb)
{ {
struct dst_entry *dst = skb_dst(skb);
int rc = 0; int rc = 0;
if (!dst)
goto discard;
if (!neigh_event_send(neigh, skb)) { if (!neigh_event_send(neigh, skb)) {
int err; int err;
struct net_device *dev = neigh->dev; struct net_device *dev = neigh->dev;
@@ -1312,8 +1308,6 @@ int neigh_resolve_output(struct neighbour *neigh, struct sk_buff *skb)
} }
out: out:
return rc; return rc;
discard:
neigh_dbg(1, "%s: dst=%p neigh=%p\n", __func__, dst, neigh);
out_kfree_skb: out_kfree_skb:
rc = -EINVAL; rc = -EINVAL;
kfree_skb(skb); kfree_skb(skb);