diff options
Diffstat (limited to 'net/core/neighbour.c')
-rw-r--r-- | net/core/neighbour.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 2328acbd16cd..d9a02b2cc289 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c | |||
@@ -839,7 +839,7 @@ static void neigh_timer_handler(unsigned long arg) | |||
839 | struct sk_buff *skb = skb_peek(&neigh->arp_queue); | 839 | struct sk_buff *skb = skb_peek(&neigh->arp_queue); |
840 | /* keep skb alive even if arp_queue overflows */ | 840 | /* keep skb alive even if arp_queue overflows */ |
841 | if (skb) | 841 | if (skb) |
842 | skb_get(skb); | 842 | skb = skb_copy(skb, GFP_ATOMIC); |
843 | write_unlock(&neigh->lock); | 843 | write_unlock(&neigh->lock); |
844 | neigh->ops->solicit(neigh, skb); | 844 | neigh->ops->solicit(neigh, skb); |
845 | atomic_inc(&neigh->probes); | 845 | atomic_inc(&neigh->probes); |
@@ -1389,10 +1389,10 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl) | |||
1389 | panic("cannot create neighbour cache statistics"); | 1389 | panic("cannot create neighbour cache statistics"); |
1390 | 1390 | ||
1391 | #ifdef CONFIG_PROC_FS | 1391 | #ifdef CONFIG_PROC_FS |
1392 | tbl->pde = create_proc_entry(tbl->id, 0, init_net.proc_net_stat); | 1392 | tbl->pde = proc_create(tbl->id, 0, init_net.proc_net_stat, |
1393 | &neigh_stat_seq_fops); | ||
1393 | if (!tbl->pde) | 1394 | if (!tbl->pde) |
1394 | panic("cannot create neighbour proc dir entry"); | 1395 | panic("cannot create neighbour proc dir entry"); |
1395 | tbl->pde->proc_fops = &neigh_stat_seq_fops; | ||
1396 | tbl->pde->data = tbl; | 1396 | tbl->pde->data = tbl; |
1397 | #endif | 1397 | #endif |
1398 | 1398 | ||