diff options
| author | Jiri Pirko <jiri@mellanox.com> | 2016-07-05 11:27:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-05 18:06:28 +0200 |
| commit | 503eebc265dcf5c512454fd5a6b6673ea4f1d7f2 (patch) | |
| tree | c1d66bfa44f67121373f4ea98a4857e5645a17eb /drivers/net/ethernet/rocker | |
| parent | Merge branch 'r6040-next' (diff) | |
| download | linux-503eebc265dcf5c512454fd5a6b6673ea4f1d7f2.tar.xz linux-503eebc265dcf5c512454fd5a6b6673ea4f1d7f2.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/rocker')
| -rw-r--r-- | drivers/net/ethernet/rocker/rocker_main.c | 3 |
1 files changed, 2 insertions, 1 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; |