leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: dsa: rename dsa_slave_upper_vlan_check to something more suggestive

Browse Source 
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>
This commit is contained in:
Vladimir Oltean
2020-09-21 03:10:24 +03:00
committed by David S. Miller
parent 8350129930
commit eb46e8da1d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/dsa/slave.c
View File

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