| Message ID | 20190331174232.22060-6-olteanv@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | NXP SJA1105 DSA driver | expand |
On Sun, Mar 31, 2019 at 08:42:20PM +0300, Vladimir Oltean wrote: > This hides the need to perform a two-phase transaction and construct a > switchdev_obj_port_vlan struct. > > Call graph (including a function that will be introduced in a follow-up > patch) looks like this now (same for the *_vlan_del function): > > dsa_slave_vlan_rx_add_vid dsa_port_setup_8021q_tagging > | | > | | > | +-------------+ > | | > v v > __dsa_port_vlan_add dsa_slave_port_obj_add > | | > +-------+ +-------+ > | | > v v > dsa_port_vlan_add > > Signed-off-by: Vladimir Oltean <olteanv@gmail.com> > --- > net/dsa/dsa_priv.h | 2 ++ > net/dsa/port.c | 31 +++++++++++++++++++++++++++++++ > net/dsa/slave.c | 16 ++-------------- > 3 files changed, 35 insertions(+), 14 deletions(-) > > diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h > index 093b7d145eb1..766d015f6f38 100644 > --- a/net/dsa/dsa_priv.h > +++ b/net/dsa/dsa_priv.h > @@ -169,6 +169,8 @@ int dsa_port_vlan_add(struct dsa_port *dp, > struct switchdev_trans *trans); > int dsa_port_vlan_del(struct dsa_port *dp, > const struct switchdev_obj_port_vlan *vlan); > +int __dsa_port_vlan_add(struct dsa_port *dp, u16 vid, u16 flags); > +int __dsa_port_vlan_del(struct dsa_port *dp, u16 vid); > int dsa_port_link_register_of(struct dsa_port *dp); > void dsa_port_link_unregister_of(struct dsa_port *dp); > > diff --git a/net/dsa/port.c b/net/dsa/port.c > index a86fe3be1261..10065a622ada 100644 > --- a/net/dsa/port.c > +++ b/net/dsa/port.c > @@ -326,6 +326,37 @@ int dsa_port_vlan_del(struct dsa_port *dp, > return 0; > } > > +int __dsa_port_vlan_add(struct dsa_port *dp, u16 vid, u16 flags) > +{ Hi Vladimir Maybe call this dsa_port_vlan_add_trans()? I don't like the __, especially when the symbol is not static. Andrew
diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index 093b7d145eb1..766d015f6f38 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -169,6 +169,8 @@ int dsa_port_vlan_add(struct dsa_port *dp, struct switchdev_trans *trans); int dsa_port_vlan_del(struct dsa_port *dp, const struct switchdev_obj_port_vlan *vlan); +int __dsa_port_vlan_add(struct dsa_port *dp, u16 vid, u16 flags); +int __dsa_port_vlan_del(struct dsa_port *dp, u16 vid); int dsa_port_link_register_of(struct dsa_port *dp); void dsa_port_link_unregister_of(struct dsa_port *dp); diff --git a/net/dsa/port.c b/net/dsa/port.c index a86fe3be1261..10065a622ada 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -326,6 +326,37 @@ int dsa_port_vlan_del(struct dsa_port *dp, return 0; } +int __dsa_port_vlan_add(struct dsa_port *dp, u16 vid, u16 flags) +{ + struct switchdev_obj_port_vlan vlan = { + .obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN, + .flags = flags, + .vid_begin = vid, + .vid_end = vid, + }; + struct switchdev_trans trans; + int err; + + trans.ph_prepare = true; + err = dsa_port_vlan_add(dp, &vlan, &trans); + if (err == -EOPNOTSUPP) + return 0; + + trans.ph_prepare = false; + return dsa_port_vlan_add(dp, &vlan, &trans); +} + +int __dsa_port_vlan_del(struct dsa_port *dp, u16 vid) +{ + struct switchdev_obj_port_vlan vlan = { + .obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN, + .vid_begin = vid, + .vid_end = vid, + }; + + return dsa_port_vlan_del(dp, &vlan); +} + static struct phy_device *dsa_port_get_phy_device(struct dsa_port *dp) { struct device_node *phy_dn; diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 093eef6f2599..e644095fdd44 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -987,13 +987,6 @@ static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid) { struct dsa_port *dp = dsa_slave_to_port(dev); - struct switchdev_obj_port_vlan vlan = { - .vid_begin = vid, - .vid_end = vid, - /* This API only allows programming tagged, non-PVID VIDs */ - .flags = 0, - }; - struct switchdev_trans trans; struct bridge_vlan_info info; int ret; @@ -1010,13 +1003,8 @@ static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto, return -EBUSY; } - trans.ph_prepare = true; - ret = dsa_port_vlan_add(dp, &vlan, &trans); - if (ret == -EOPNOTSUPP) - return 0; - - trans.ph_prepare = false; - return dsa_port_vlan_add(dp, &vlan, &trans); + /* This API only allows programming tagged, non-PVID VIDs */ + return __dsa_port_vlan_add(dp, vid, 0); } static int dsa_slave_vlan_rx_kill_vid(struct net_device *dev, __be16 proto,
This hides the need to perform a two-phase transaction and construct a switchdev_obj_port_vlan struct. Call graph (including a function that will be introduced in a follow-up patch) looks like this now (same for the *_vlan_del function): dsa_slave_vlan_rx_add_vid dsa_port_setup_8021q_tagging | | | | | +-------------+ | | v v __dsa_port_vlan_add dsa_slave_port_obj_add | | +-------+ +-------+ | | v v dsa_port_vlan_add Signed-off-by: Vladimir Oltean <olteanv@gmail.com> --- net/dsa/dsa_priv.h | 2 ++ net/dsa/port.c | 31 +++++++++++++++++++++++++++++++ net/dsa/slave.c | 16 ++-------------- 3 files changed, 35 insertions(+), 14 deletions(-)