lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

neigh: Convert over to dst_neigh_lookup_skb().

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2012-07-02 22:15:37 -07:00
parent f9d751667f
commit 13a43d94ab
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
net/core/neighbour.c
View File

@@ -1201,10 +1201,23 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
write_unlock_bh(&neigh->lock); write_unlock_bh(&neigh->lock);
rcu_read_lock(); rcu_read_lock();
/* On shaper/eql skb->dst->neighbour != neigh :( */
if (dst && (n2 = dst_get_neighbour_noref(dst)) != NULL) /* Why not just use 'neigh' as-is? The problem is that
n1 = n2; * things such as shaper, eql, and sch_teql can end up
* using alternative, different, neigh objects to output
* the packet in the output path. So what we need to do
* here is re-lookup the top-level neigh in the path so
* we can reinject the packet there.
*/
n2 = NULL;
if (dst) {
n2 = dst_neigh_lookup_skb(dst, skb);
if (n2)
n1 = n2;
}
n1->output(n1, skb); n1->output(n1, skb);
if (n2)
neigh_release(n2);
rcu_read_unlock(); rcu_read_unlock();
write_lock_bh(&neigh->lock); write_lock_bh(&neigh->lock);