Commit f3b0a18b authored by Taehee Yoo's avatar Taehee Yoo Committed by David S. Miller
Browse files

net: remove unnecessary variables and callback 



This patch removes variables and callback these are related to the nested
device structure.
devices that can be nested have their own nest_level variable that
represents the depth of nested devices.
In the previous patch, new {lower/upper}_level variables are added and
they replace old private nest_level variable.
So, this patch removes all 'nest_level' variables.

In order to avoid lockdep warning, ->ndo_get_lock_subclass() was added
to get lockdep subclass value, which is actually lower nested depth value.
But now, they use the dynamic lockdep key to avoid lockdep warning instead
of the subclass.
So, this patch removes ->ndo_get_lock_subclass() callback.

Signed-off-by: default avatarTaehee Yoo <ap420073@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0ce1822c

drivers/net/bonding/bond_alb.c

+1 −1
Original line number Diff line number Diff line
@@ -952,7 +952,7 @@ static int alb_upper_dev_walk(struct net_device *upper, void *_data) 
	struct bond_vlan_tag *tags;



	if (is_vlan_dev(upper) &&

	    bond->nest_level == vlan_get_encap_level(upper) - 1) {

	    bond->dev->lower_level == upper->lower_level - 1) {

		if (upper->addr_assign_type == NET_ADDR_STOLEN) {

			alb_send_lp_vid(slave, mac_addr,

					vlan_dev_vlan_proto(upper),

drivers/net/bonding/bond_main.c

+0 −15
Original line number Diff line number Diff line
@@ -1733,8 +1733,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
		goto err_upper_unlink;

	}



	bond->nest_level = dev_get_nest_level(bond_dev) + 1;



	/* If the mode uses primary, then the following is handled by

	 * bond_change_active_slave().

	 */
@@ -1957,9 +1955,6 @@ static int __bond_release_one(struct net_device *bond_dev, 
	if (!bond_has_slaves(bond)) {

		bond_set_carrier(bond);

		eth_hw_addr_random(bond_dev);

		bond->nest_level = SINGLE_DEPTH_NESTING;

	} else {

		bond->nest_level = dev_get_nest_level(bond_dev) + 1;

	}



	unblock_netpoll_tx();
@@ -3444,13 +3439,6 @@ static void bond_fold_stats(struct rtnl_link_stats64 *_res, 
	}

}



static int bond_get_nest_level(struct net_device *bond_dev)

{

	struct bonding *bond = netdev_priv(bond_dev);



	return bond->nest_level;

}



static void bond_get_stats(struct net_device *bond_dev,

			   struct rtnl_link_stats64 *stats)

{
@@ -4270,7 +4258,6 @@ static const struct net_device_ops bond_netdev_ops = { 
	.ndo_neigh_setup	= bond_neigh_setup,

	.ndo_vlan_rx_add_vid	= bond_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid	= bond_vlan_rx_kill_vid,

	.ndo_get_lock_subclass  = bond_get_nest_level,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_netpoll_setup	= bond_netpoll_setup,

	.ndo_netpoll_cleanup	= bond_netpoll_cleanup,
@@ -4769,8 +4756,6 @@ static int bond_init(struct net_device *bond_dev) 
	if (!bond->wq)

		return -ENOMEM;



	bond->nest_level = SINGLE_DEPTH_NESTING;



	spin_lock_init(&bond->mode_lock);

	spin_lock_init(&bond->stats_lock);

	lockdep_register_key(&bond->stats_lock_key);

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+1 −1
Original line number Diff line number Diff line
@@ -3160,7 +3160,7 @@ static int add_vlan_pop_action(struct mlx5e_priv *priv, 
			       struct mlx5_esw_flow_attr *attr,

			       u32 *action)

{

	int nest_level = vlan_get_encap_level(attr->parse_attr->filter_dev);

	int nest_level = attr->parse_attr->filter_dev->lower_level;

	struct flow_action_entry vlan_act = {

		.id = FLOW_ACTION_VLAN_POP,

	};

drivers/net/macsec.c

+0 −9
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ struct macsec_dev { 
	struct pcpu_secy_stats __percpu *stats;

	struct list_head secys;

	struct gro_cells gro_cells;

	unsigned int nest_level;

};



/**
@@ -2957,11 +2956,6 @@ static int macsec_get_iflink(const struct net_device *dev) 
	return macsec_priv(dev)->real_dev->ifindex;

}



static int macsec_get_nest_level(struct net_device *dev)

{

	return macsec_priv(dev)->nest_level;

}



static const struct net_device_ops macsec_netdev_ops = {

	.ndo_init		= macsec_dev_init,

	.ndo_uninit		= macsec_dev_uninit,
@@ -2975,7 +2969,6 @@ static const struct net_device_ops macsec_netdev_ops = { 
	.ndo_start_xmit		= macsec_start_xmit,

	.ndo_get_stats64	= macsec_get_stats64,

	.ndo_get_iflink		= macsec_get_iflink,

	.ndo_get_lock_subclass  = macsec_get_nest_level,

};



static const struct device_type macsec_type = {
@@ -3258,8 +3251,6 @@ static int macsec_newlink(struct net *net, struct net_device *dev, 
	if (err < 0)

		return err;



	macsec->nest_level = dev_get_nest_level(real_dev) + 1;



	err = netdev_upper_dev_link(real_dev, dev, extack);

	if (err < 0)

		goto unregister;

drivers/net/macvlan.c

+0 −7
Original line number Diff line number Diff line
@@ -867,11 +867,6 @@ static int macvlan_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
#define MACVLAN_STATE_MASK \

	((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT))



static int macvlan_get_nest_level(struct net_device *dev)

{

	return ((struct macvlan_dev *)netdev_priv(dev))->nest_level;

}



static int macvlan_init(struct net_device *dev)

{

	struct macvlan_dev *vlan = netdev_priv(dev);
@@ -1149,7 +1144,6 @@ static const struct net_device_ops macvlan_netdev_ops = { 
	.ndo_fdb_add		= macvlan_fdb_add,

	.ndo_fdb_del		= macvlan_fdb_del,

	.ndo_fdb_dump		= ndo_dflt_fdb_dump,

	.ndo_get_lock_subclass  = macvlan_get_nest_level,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= macvlan_dev_poll_controller,

	.ndo_netpoll_setup	= macvlan_dev_netpoll_setup,
@@ -1433,7 +1427,6 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev, 
	vlan->dev      = dev;

	vlan->port     = port;

	vlan->set_features = MACVLAN_FEATURES;

	vlan->nest_level = dev_get_nest_level(lowerdev) + 1;



	vlan->mode     = MACVLAN_MODE_VEPA;

	if (data && data[IFLA_MACVLAN_MODE])

CRA Git | Maintained and supported by SUSTech CRA and CCSE