Add support for delivering SWITCHDEV_ATTR_ID_PORT_MROUTER event to DSA subsystem. This is essentially 08cc83c ("net: dsa: add support for BRIDGE_MROUTER attribute") repurposed for PORT_MROUTER. Signed-off-by: Joseph Huang <Joseph.Huang@xxxxxxxxxx> --- include/net/dsa.h | 2 ++ net/dsa/port.c | 11 +++++++++++ net/dsa/port.h | 2 ++ net/dsa/user.c | 6 ++++++ 4 files changed, 21 insertions(+) diff --git a/include/net/dsa.h b/include/net/dsa.h index 7c0da9effe4e..5dc5838caa9c 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -1037,6 +1037,8 @@ struct dsa_switch_ops { int (*port_bridge_flags)(struct dsa_switch *ds, int port, struct switchdev_brport_flags flags, struct netlink_ext_ack *extack); + int (*port_mrouter)(struct dsa_switch *ds, int port, bool mrouter, + struct netlink_ext_ack *extack); void (*port_set_host_flood)(struct dsa_switch *ds, int port, bool uc, bool mc); diff --git a/net/dsa/port.c b/net/dsa/port.c index c42dac87671b..3f689cb713aa 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -948,6 +948,17 @@ int dsa_port_bridge_flags(struct dsa_port *dp, return 0; } +int dsa_port_mrouter(struct dsa_port *dp, bool mrouter, + struct netlink_ext_ack *extack) +{ + struct dsa_switch *ds = dp->ds; + + if (!ds->ops->port_mrouter) + return -EOPNOTSUPP; + + return ds->ops->port_mrouter(ds, dp->index, mrouter, extack); +} + void dsa_port_set_host_flood(struct dsa_port *dp, bool uc, bool mc) { struct dsa_switch *ds = dp->ds; diff --git a/net/dsa/port.h b/net/dsa/port.h index 6bc3291573c0..85102e1659ae 100644 --- a/net/dsa/port.h +++ b/net/dsa/port.h @@ -81,6 +81,8 @@ int dsa_port_pre_bridge_flags(const struct dsa_port *dp, int dsa_port_bridge_flags(struct dsa_port *dp, struct switchdev_brport_flags flags, struct netlink_ext_ack *extack); +int dsa_port_mrouter(struct dsa_port *dp, bool mrouter, + struct netlink_ext_ack *extack); int dsa_port_vlan_add(struct dsa_port *dp, const struct switchdev_obj_port_vlan *vlan, struct netlink_ext_ack *extack); diff --git a/net/dsa/user.c b/net/dsa/user.c index 16d395bb1a1f..f69c4df143f7 100644 --- a/net/dsa/user.c +++ b/net/dsa/user.c @@ -647,6 +647,12 @@ static int dsa_user_port_attr_set(struct net_device *dev, const void *ctx, ret = dsa_port_bridge_flags(dp, attr->u.brport_flags, extack); break; + case SWITCHDEV_ATTR_ID_PORT_MROUTER: + if (!dsa_port_offloads_bridge_port(dp, attr->orig_dev)) + return -EOPNOTSUPP; + + ret = dsa_port_mrouter(dp, attr->u.mrouter, extack); + break; case SWITCHDEV_ATTR_ID_VLAN_MSTI: if (!dsa_port_offloads_bridge_dev(dp, attr->orig_dev)) return -EOPNOTSUPP; -- 2.17.1