openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: dsa: check bridge VLAN in slave operations 

The bridge VLANs are not offloaded by dsa_port_vlan_* if the port is
not bridged or if its bridge is not VLAN aware.

This is a good thing but other corners of DSA, such as the tag_8021q
driver, may need to program VLANs regardless the bridge state.

And also because bridge_dev is specific to user ports anyway, move
these checks were it belongs, one layer up in the slave code.

Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Suggested-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot 2019-08-25 13:25:18 -04:00 committed by David S. Miller
parent bdcff080f7
commit c5335d737f
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/dsa/port.c
View File

@ -348,10 +348,7 @@ int dsa_port_vlan_add(struct dsa_port *dp,
.vlan = vlan, .vlan = vlan,
}; };
if (!dp->bridge_dev || br_vlan_enabled(dp->bridge_dev)) return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &info);
return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &info);
return 0;
} }
int dsa_port_vlan_del(struct dsa_port *dp, int dsa_port_vlan_del(struct dsa_port *dp,
@ -363,10 +360,7 @@ int dsa_port_vlan_del(struct dsa_port *dp,
.vlan = vlan, .vlan = vlan,
}; };
if (!dp->bridge_dev || br_vlan_enabled(dp->bridge_dev)) return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info);
return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info);
return 0;
} }
int dsa_port_vid_add(struct dsa_port *dp, u16 vid, u16 flags) int dsa_port_vid_add(struct dsa_port *dp, u16 vid, u16 flags)

12
net/dsa/slave.c
View File

@ -323,6 +323,9 @@ static int dsa_slave_vlan_add(struct net_device *dev,
if (obj->orig_dev != dev) if (obj->orig_dev != dev)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (dp->bridge_dev && !br_vlan_enabled(dp->bridge_dev))
return 0;
vlan = *SWITCHDEV_OBJ_PORT_VLAN(obj); vlan = *SWITCHDEV_OBJ_PORT_VLAN(obj);
err = dsa_port_vlan_add(dp, &vlan, trans); err = dsa_port_vlan_add(dp, &vlan, trans);
@ -377,6 +380,9 @@ static int dsa_slave_vlan_del(struct net_device *dev,
if (obj->orig_dev != dev) if (obj->orig_dev != dev)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (dp->bridge_dev && !br_vlan_enabled(dp->bridge_dev))
return 0;
return dsa_port_vlan_del(dp, SWITCHDEV_OBJ_PORT_VLAN(obj)); return dsa_port_vlan_del(dp, SWITCHDEV_OBJ_PORT_VLAN(obj));
} }
@ -1099,6 +1105,9 @@ static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto,
* need to emulate the switchdev prepare + commit phase. * need to emulate the switchdev prepare + commit phase.
*/ */
if (dp->bridge_dev) { if (dp->bridge_dev) {
if (!br_vlan_enabled(dp->bridge_dev))
return 0;
/* br_vlan_get_info() returns -EINVAL or -ENOENT if the /* br_vlan_get_info() returns -EINVAL or -ENOENT if the
* device, respectively the VID is not found, returning * device, respectively the VID is not found, returning
* 0 means success, which is a failure for us here. * 0 means success, which is a failure for us here.
@ -1126,6 +1135,9 @@ static int dsa_slave_vlan_rx_kill_vid(struct net_device *dev, __be16 proto,
* need to emulate the switchdev prepare + commit phase. * need to emulate the switchdev prepare + commit phase.
*/ */
if (dp->bridge_dev) { if (dp->bridge_dev) {
if (!br_vlan_enabled(dp->bridge_dev))
return 0;
/* br_vlan_get_info() returns -EINVAL or -ENOENT if the /* br_vlan_get_info() returns -EINVAL or -ENOENT if the
* device, respectively the VID is not found, returning * device, respectively the VID is not found, returning
* 0 means success, which is a failure for us here. * 0 means success, which is a failure for us here.