net: add dev arg to ndo_neigh_construct/destroy

As the following patch will allow upper devices to follow the call down
lower devices, we need to add dev here and not rely on n->dev.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 10 insertions, 7 deletions

diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c
index 28b775e5a9ad..f0b09b05ed3f 100644
--- a/drivers/net/ethernet/rocker/rocker_main.c
+++ b/drivers/net/ethernet/rocker/rocker_main.c
@@ -1996,7 +1996,8 @@ static int rocker_port_change_proto_down(struct net_device *dev,
         return 0;
 }
 
-static void rocker_port_neigh_destroy(struct neighbour *n)
+static void rocker_port_neigh_destroy(struct net_device *dev,
+                                      struct neighbour *n)
 {
         struct rocker_port *rocker_port = netdev_priv(n->dev);
         int err;
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 0c6ee2c5099f..91af73c9dd51 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1209,8 +1209,10 @@ struct net_device_ops {
                                                     netdev_features_t features);
         int                     (*ndo_set_features)(struct net_device *dev,
                                                     netdev_features_t features);
-        int                     (*ndo_neigh_construct)(struct neighbour *n);
-        void                    (*ndo_neigh_destroy)(struct neighbour *n);
+        int                     (*ndo_neigh_construct)(struct net_device *dev,
+                                                       struct neighbour *n);
+        void                    (*ndo_neigh_destroy)(struct net_device *dev,
+                                                     struct neighbour *n);
 
         int                     (*ndo_fdb_add)(struct ndmsg *ndm,
                                                struct nlattr *tb[],
diff --git a/net/atm/clip.c b/net/atm/clip.c
index e07f551a863c..53b4ac09e7b7 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -286,7 +286,7 @@ static const struct neigh_ops clip_neigh_ops = {
         .connected_output =     neigh_direct_output,
 };
 
-static int clip_constructor(struct neighbour *neigh)
+static int clip_constructor(struct net_device *dev, struct neighbour *neigh)
 {
         struct atmarp_entry *entry = neighbour_priv(neigh);
 
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 510cd62fcb99..952aabb5aa56 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -473,7 +473,7 @@ struct neighbour *__neigh_create(struct neigh_table *tbl, const void *pkey,
         }
 
         if (dev->netdev_ops->ndo_neigh_construct) {
-                error = dev->netdev_ops->ndo_neigh_construct(n);
+                error = dev->netdev_ops->ndo_neigh_construct(dev, n);
                 if (error < 0) {
                         rc = ERR_PTR(error);
                         goto out_neigh_release;
@@ -701,7 +701,7 @@ void neigh_destroy(struct neighbour *neigh)
         neigh->arp_queue_len_bytes = 0;
 
         if (dev->netdev_ops->ndo_neigh_destroy)
-                dev->netdev_ops->ndo_neigh_destroy(neigh);
+                dev->netdev_ops->ndo_neigh_destroy(dev, neigh);
 
         dev_put(dev);
         neigh_parms_put(neigh->parms);
diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
index 8c004a0c8d64..935ab932e841 100644
--- a/net/ieee802154/6lowpan/core.c
+++ b/net/ieee802154/6lowpan/core.c
@@ -81,7 +81,7 @@ static int lowpan_stop(struct net_device *dev)
         return 0;
 }
 
-static int lowpan_neigh_construct(struct neighbour *n)
+static int lowpan_neigh_construct(struct net_device *dev, struct neighbour *n)
 {
         struct lowpan_802154_neigh *neigh = lowpan_802154_neigh(neighbour_priv(n));