OSDN Git Service

rocker: Handle SWITCHDEV_PORT_ATTR_SET
authorFlorian Fainelli <f.fainelli@gmail.com>
Wed, 27 Feb 2019 19:44:26 +0000 (11:44 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 Feb 2019 20:39:55 +0000 (12:39 -0800)
Following patches will change the way we communicate setting a port's
attribute and use notifiers towards that goal.

Prepare rocker to support receiving notifier events targeting
SWITCHDEV_PORT_ATTR_SET from both atomic and process context and use a
small helper to translate the event notifier into something that
rocker_port_attr_set() can process.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/rocker/rocker_main.c

index 309a6bf..fc772cf 100644 (file)
@@ -2710,6 +2710,19 @@ static bool rocker_port_dev_check(const struct net_device *dev)
        return dev->netdev_ops == &rocker_port_netdev_ops;
 }
 
+static int
+rocker_switchdev_port_attr_set_event(struct net_device *netdev,
+               struct switchdev_notifier_port_attr_info *port_attr_info)
+{
+       int err;
+
+       err = rocker_port_attr_set(netdev, port_attr_info->attr,
+                                  port_attr_info->trans);
+
+       port_attr_info->handled = true;
+       return notifier_from_errno(err);
+}
+
 struct rocker_switchdev_event_work {
        struct work_struct work;
        struct switchdev_notifier_fdb_info fdb_info;
@@ -2779,6 +2792,9 @@ static int rocker_switchdev_event(struct notifier_block *unused,
        if (!rocker_port_dev_check(dev))
                return NOTIFY_DONE;
 
+       if (event == SWITCHDEV_PORT_ATTR_SET)
+               return rocker_switchdev_port_attr_set_event(dev, ptr);
+
        rocker_port = netdev_priv(dev);
        switchdev_work = kzalloc(sizeof(*switchdev_work), GFP_ATOMIC);
        if (WARN_ON(!switchdev_work))
@@ -2841,6 +2857,8 @@ static int rocker_switchdev_blocking_event(struct notifier_block *unused,
        case SWITCHDEV_PORT_OBJ_ADD:
        case SWITCHDEV_PORT_OBJ_DEL:
                return rocker_switchdev_port_obj_event(event, dev, ptr);
+       case SWITCHDEV_PORT_ATTR_SET:
+               return rocker_switchdev_port_attr_set_event(dev, ptr);
        }
 
        return NOTIFY_DONE;