net: dsa: rename dsa_slave_upper_vlan_check to something more suggestive (eb46e8da) · Commits · 戴 / test

We'll be adding a new check in the PRECHANGEUPPER notifier, where we'll need to check some VLAN uppers. It is hard to do that when there is already a function named dsa_slave_upper_vlan_check. So rename this one. Not to mention that this function probably shouldn't have started with "dsa_slave_" in the first place, since the struct net_device argument isn't a DSA slave, but an 8021q upper of one. Signed-off-by:

Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by:

Florian Fainelli <f.fainelli@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/dsa/slave.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1895,9 +1895,9 @@ static int dsa_slave_changeupper(struct net_device *dev,
		return err;
		}

		static int dsa_slave_upper_vlan_check(struct net_device *dev,
		struct netdev_notifier_changeupper_info *
		info)
		static int
		dsa_prevent_bridging_8021q_upper(struct net_device *dev,
		struct netdev_notifier_changeupper_info *info)
		{
		struct netlink_ext_ack *ext_ack;
		struct net_device *slave;
		@@ -1935,7 +1935,7 @@ static int dsa_slave_netdevice_event(struct notifier_block *nb,
		switch (event) {
		case NETDEV_PRECHANGEUPPER:
		if (!dsa_slave_dev_check(dev))
		return dsa_slave_upper_vlan_check(dev, ptr);
		return dsa_prevent_bridging_8021q_upper(dev, ptr);
		break;
		case NETDEV_CHANGEUPPER:
		if (!dsa_slave_dev_check(dev))

Admin message