diff --git a/[refs] b/[refs] index e7bf191eb47f..b78a566b1185 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1673ca52c04f1b311abe03fd67cd4d650d19435 +refs/heads/master: 4ae289444b968b4cefd776ada8da519ce10e56fa diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c index c52df858d0be..cd3af59b38a1 100644 --- a/trunk/net/core/neighbour.c +++ b/trunk/net/core/neighbour.c @@ -481,6 +481,8 @@ struct pneigh_entry * pneigh_lookup(struct neigh_table *tbl, const void *pkey, if (!creat) goto out; + ASSERT_RTNL(); + n = kmalloc(sizeof(*n) + key_len, GFP_KERNEL); if (!n) goto out;