diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2020-09-21 03:10:24 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-20 19:01:33 -0700 |
| commit | eb46e8da1d2c52963718697d90cc8cddb73425dd (patch) | |
| tree | 854ef005d3f0522ed8071ae30f70a4d3f32bf30f /net/dsa/slave.c | |
| parent | 8350129930d2d74426b03d2d59d121156c204531 (diff) | |
| download | linux-eb46e8da1d2c52963718697d90cc8cddb73425dd.tar.gz linux-eb46e8da1d2c52963718697d90cc8cddb73425dd.tar.bz2 linux-eb46e8da1d2c52963718697d90cc8cddb73425dd.zip | |
net: dsa: rename dsa_slave_upper_vlan_check to something more suggestive
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>
Diffstat (limited to 'net/dsa/slave.c')
| -rw-r--r-- | net/dsa/slave.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index e29899431e07..8ad5bf487181 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -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)) |