| Message ID | 20190210234007.16173-8-f.fainelli@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: Remove switchdev_ops | expand |
Mon, Feb 11, 2019 at 12:40:05AM CET, f.fainelli@gmail.com wrote: >Following patches will change the way we communicate getting or setting >a port's attribute and use a blocking notifier to perform those tasks. > >Prepare DSA to support receiving notifier events targeting >SWITCHDEV_PORT_ATTR_GET/SET and simply translate that into the existing >dsa_slave_port_attr_{set,get} calls. > >Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> >--- > net/dsa/slave.c | 24 ++++++++++++++++++++++++ > 1 file changed, 24 insertions(+) > >diff --git a/net/dsa/slave.c b/net/dsa/slave.c >index 2e5e7c04821b..2a14a38f5f93 100644 >--- a/net/dsa/slave.c >+++ b/net/dsa/slave.c >@@ -1558,6 +1558,27 @@ dsa_slave_switchdev_port_obj_event(unsigned long event, > return notifier_from_errno(err); > } > >+static int >+dsa_slave_switchdev_port_attr_event(unsigned long event, >+ struct net_device *netdev, >+ struct switchdev_notifier_port_attr_info *port_attr_info) >+{ >+ int err = -EOPNOTSUPP; >+ >+ switch (event) { >+ case SWITCHDEV_PORT_ATTR_SET: >+ err = dsa_slave_port_attr_set(netdev, port_attr_info->attr, >+ port_attr_info->trans); >+ break; >+ case SWITCHDEV_PORT_ATTR_GET: >+ err = dsa_slave_port_attr_get(netdev, port_attr_info->attr); >+ break; >+ } >+ >+ port_attr_info->handled = true; >+ return notifier_from_errno(err); >+} >+ > static int dsa_slave_switchdev_blocking_event(struct notifier_block *unused, > unsigned long event, void *ptr) > { >@@ -1570,6 +1591,9 @@ static int dsa_slave_switchdev_blocking_event(struct notifier_block *unused, > case SWITCHDEV_PORT_OBJ_ADD: /* fall through */ > case SWITCHDEV_PORT_OBJ_DEL: > return dsa_slave_switchdev_port_obj_event(event, dev, ptr); >+ case SWITCHDEV_PORT_ATTR_SET: /* fallthrough */ The case above has "fall through". It would be nice to be consistent. Anyway: Acked-by: Jiri Pirko <jiri@mellanox.com> >+ case SWITCHDEV_PORT_ATTR_GET: >+ return dsa_slave_switchdev_port_attr_event(event, dev, ptr); > } > > return NOTIFY_DONE; >-- >2.19.1 >
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 2e5e7c04821b..2a14a38f5f93 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1558,6 +1558,27 @@ dsa_slave_switchdev_port_obj_event(unsigned long event, return notifier_from_errno(err); } +static int +dsa_slave_switchdev_port_attr_event(unsigned long event, + struct net_device *netdev, + struct switchdev_notifier_port_attr_info *port_attr_info) +{ + int err = -EOPNOTSUPP; + + switch (event) { + case SWITCHDEV_PORT_ATTR_SET: + err = dsa_slave_port_attr_set(netdev, port_attr_info->attr, + port_attr_info->trans); + break; + case SWITCHDEV_PORT_ATTR_GET: + err = dsa_slave_port_attr_get(netdev, port_attr_info->attr); + break; + } + + port_attr_info->handled = true; + return notifier_from_errno(err); +} + static int dsa_slave_switchdev_blocking_event(struct notifier_block *unused, unsigned long event, void *ptr) { @@ -1570,6 +1591,9 @@ static int dsa_slave_switchdev_blocking_event(struct notifier_block *unused, case SWITCHDEV_PORT_OBJ_ADD: /* fall through */ case SWITCHDEV_PORT_OBJ_DEL: return dsa_slave_switchdev_port_obj_event(event, dev, ptr); + case SWITCHDEV_PORT_ATTR_SET: /* fallthrough */ + case SWITCHDEV_PORT_ATTR_GET: + return dsa_slave_switchdev_port_attr_event(event, dev, ptr); } return NOTIFY_DONE;
Following patches will change the way we communicate getting or setting a port's attribute and use a blocking notifier to perform those tasks. Prepare DSA to support receiving notifier events targeting SWITCHDEV_PORT_ATTR_GET/SET and simply translate that into the existing dsa_slave_port_attr_{set,get} calls. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- net/dsa/slave.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)