aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/neighbour.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/core/neighbour.c')
-rw-r--r--net/core/neighbour.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 4af151e1bf5d..d57a40a2598c 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -497,13 +497,6 @@ struct neighbour *neigh_create(struct neigh_table *tbl, const void *pkey,
497 } 497 }
498 } 498 }
499 499
500 /* Device specific setup. */
501 if (n->parms->neigh_setup &&
502 (error = n->parms->neigh_setup(n)) < 0) {
503 rc = ERR_PTR(error);
504 goto out_neigh_release;
505 }
506
507 n->confirmed = jiffies - (n->parms->base_reachable_time << 1); 500 n->confirmed = jiffies - (n->parms->base_reachable_time << 1);
508 501
509 write_lock_bh(&tbl->lock); 502 write_lock_bh(&tbl->lock);
@@ -717,9 +710,6 @@ void neigh_destroy(struct neighbour *neigh)
717 skb_queue_purge(&neigh->arp_queue); 710 skb_queue_purge(&neigh->arp_queue);
718 neigh->arp_queue_len_bytes = 0; 711 neigh->arp_queue_len_bytes = 0;
719 712
720 if (dev->netdev_ops->ndo_neigh_destroy)
721 dev->netdev_ops->ndo_neigh_destroy(neigh);
722
723 dev_put(dev); 713 dev_put(dev);
724 neigh_parms_put(neigh->parms); 714 neigh_parms_put(neigh->parms);
725 715