Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 1 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 29dd8cc22bbf..510cd62fcb99 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2469,13 +2469,17 @@ int neigh_xmit(int index, struct net_device *dev,
                 tbl = neigh_tables[index];
                 if (!tbl)
                         goto out;
+                rcu_read_lock_bh();
                 neigh = __neigh_lookup_noref(tbl, addr, dev);
                 if (!neigh)
                         neigh = __neigh_create(tbl, addr, dev, false);
                 err = PTR_ERR(neigh);
-                if (IS_ERR(neigh))
+                if (IS_ERR(neigh)) {
+                        rcu_read_unlock_bh();
                         goto out_kfree_skb;
+                }
                 err = neigh->output(neigh, skb);
+                rcu_read_unlock_bh();
         }
         else if (index == NEIGH_LINK_TABLE) {
                 err = dev_hard_header(skb, dev, ntohs(skb->protocol),