Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8eca326 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

net: remove ndo_neigh_{construct, destroy} from stacked devices 



In commit 18bfb924 ("net: introduce default neigh_construct/destroy
ndo calls for L2 upper devices") we added these ndos to stacked devices
such as team and bond, so that calls will be propagated to mlxsw.

However, previous commit removed the reliance on these ndos and no new
users of these ndos have appeared since above mentioned commit. We can
therefore safely remove this dead code.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c8802f1

drivers/net/bonding/bond_main.c

+0 −2
Original line number Diff line number Diff line
@@ -4145,8 +4145,6 @@ static const struct net_device_ops bond_netdev_ops = { 
	.ndo_add_slave		= bond_enslave,

	.ndo_del_slave		= bond_release,

	.ndo_fix_features	= bond_fix_features,

	.ndo_neigh_construct	= netdev_default_l2upper_neigh_construct,

	.ndo_neigh_destroy	= netdev_default_l2upper_neigh_destroy,

	.ndo_bridge_setlink	= switchdev_port_bridge_setlink,

	.ndo_bridge_getlink	= switchdev_port_bridge_getlink,

	.ndo_bridge_dellink	= switchdev_port_bridge_dellink,

drivers/net/team/team.c

+0 −2
Original line number Diff line number Diff line
@@ -2001,8 +2001,6 @@ static const struct net_device_ops team_netdev_ops = { 
	.ndo_add_slave		= team_add_slave,

	.ndo_del_slave		= team_del_slave,

	.ndo_fix_features	= team_fix_features,

	.ndo_neigh_construct	= netdev_default_l2upper_neigh_construct,

	.ndo_neigh_destroy	= netdev_default_l2upper_neigh_destroy,

	.ndo_change_carrier     = team_change_carrier,

	.ndo_bridge_setlink	= switchdev_port_bridge_setlink,

	.ndo_bridge_getlink	= switchdev_port_bridge_getlink,

include/linux/netdevice.h

+0 −4
Original line number Diff line number Diff line
@@ -3888,10 +3888,6 @@ void *netdev_lower_dev_get_private(struct net_device *dev, 
				   struct net_device *lower_dev);

void netdev_lower_state_changed(struct net_device *lower_dev,

				void *lower_state_info);

int netdev_default_l2upper_neigh_construct(struct net_device *dev,

					   struct neighbour *n);

void netdev_default_l2upper_neigh_destroy(struct net_device *dev,

					  struct neighbour *n);



/* RSS keys are 40 or 52 bytes long */

#define NETDEV_RSS_KEY_LEN 52

net/8021q/vlan_dev.c

+0 −2
Original line number Diff line number Diff line
@@ -791,8 +791,6 @@ static const struct net_device_ops vlan_netdev_ops = { 
	.ndo_netpoll_cleanup	= vlan_dev_netpoll_cleanup,

#endif

	.ndo_fix_features	= vlan_dev_fix_features,

	.ndo_neigh_construct	= netdev_default_l2upper_neigh_construct,

	.ndo_neigh_destroy	= netdev_default_l2upper_neigh_destroy,

	.ndo_fdb_add		= switchdev_port_fdb_add,

	.ndo_fdb_del		= switchdev_port_fdb_del,

	.ndo_fdb_dump		= switchdev_port_fdb_dump,

net/bridge/br_device.c

+0 −2
Original line number Diff line number Diff line
@@ -347,8 +347,6 @@ static const struct net_device_ops br_netdev_ops = { 
	.ndo_add_slave		 = br_add_slave,

	.ndo_del_slave		 = br_del_slave,

	.ndo_fix_features        = br_fix_features,

	.ndo_neigh_construct	 = netdev_default_l2upper_neigh_construct,

	.ndo_neigh_destroy	 = netdev_default_l2upper_neigh_destroy,

	.ndo_fdb_add		 = br_fdb_add,

	.ndo_fdb_del		 = br_fdb_delete,

	.ndo_fdb_dump		 = br_fdb_dump,