net: switchdev: Add extack argument to switchdev_port_obj_add()

After the previous patch, bridge driver has extack argument available to
pass to switchdev. Therefore extend switchdev_port_obj_add() with this
argument, updating all callers, and passing the argument through to
switchdev_port_obj_notify().

Signed-off-by: Petr Machata <petrm@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Ivan Vecera <ivecera@redhat.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 11 insertions, 8 deletions

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index fe23fac4dc4b..cb20669bf6ce 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -356,7 +356,8 @@ static size_t switchdev_obj_size(const struct switchdev_obj *obj)
 static int switchdev_port_obj_notify(enum switchdev_notifier_type nt,
                                      struct net_device *dev,
                                      const struct switchdev_obj *obj,
-                                     struct switchdev_trans *trans)
+                                     struct switchdev_trans *trans,
+                                     struct netlink_ext_ack *extack)
 {
         int rc;
         int err;
@@ -379,7 +380,8 @@ static int switchdev_port_obj_notify(enum switchdev_notifier_type nt,
 }
 
 static int switchdev_port_obj_add_now(struct net_device *dev,
-                                      const struct switchdev_obj *obj)
+                                      const struct switchdev_obj *obj,
+                                      struct netlink_ext_ack *extack)
 {
         struct switchdev_trans trans;
         int err;
@@ -397,7 +399,7 @@ static int switchdev_port_obj_add_now(struct net_device *dev,
 
         trans.ph_prepare = true;
         err = switchdev_port_obj_notify(SWITCHDEV_PORT_OBJ_ADD,
-                                        dev, obj, &trans);
+                                        dev, obj, &trans, extack);
         if (err) {
                 /* Prepare phase failed: abort the transaction.  Any
                  * resources reserved in the prepare phase are
@@ -417,7 +419,7 @@ static int switchdev_port_obj_add_now(struct net_device *dev,
 
         trans.ph_prepare = false;
         err = switchdev_port_obj_notify(SWITCHDEV_PORT_OBJ_ADD,
-                                        dev, obj, &trans);
+                                        dev, obj, &trans, extack);
         WARN(err, "%s: Commit of object (id=%d) failed.\n", dev->name, obj->id);
         switchdev_trans_items_warn_destroy(dev, &trans);
 
@@ -430,7 +432,7 @@ static void switchdev_port_obj_add_deferred(struct net_device *dev,
         const struct switchdev_obj *obj = data;
         int err;
 
-        err = switchdev_port_obj_add_now(dev, obj);
+        err = switchdev_port_obj_add_now(dev, obj, NULL);
         if (err && err != -EOPNOTSUPP)
                 netdev_err(dev, "failed (err=%d) to add object (id=%d)\n",
                            err, obj->id);
@@ -460,12 +462,13 @@ static int switchdev_port_obj_add_defer(struct net_device *dev,
  *      in case SWITCHDEV_F_DEFER flag is not set.
  */
 int switchdev_port_obj_add(struct net_device *dev,
-                           const struct switchdev_obj *obj)
+                           const struct switchdev_obj *obj,
+                           struct netlink_ext_ack *extack)
 {
         if (obj->flags & SWITCHDEV_F_DEFER)
                 return switchdev_port_obj_add_defer(dev, obj);
         ASSERT_RTNL();
-        return switchdev_port_obj_add_now(dev, obj);
+        return switchdev_port_obj_add_now(dev, obj, extack);
 }
 EXPORT_SYMBOL_GPL(switchdev_port_obj_add);
 
@@ -473,7 +476,7 @@ static int switchdev_port_obj_del_now(struct net_device *dev,
                                       const struct switchdev_obj *obj)
 {
         return switchdev_port_obj_notify(SWITCHDEV_PORT_OBJ_DEL,
-                                         dev, obj, NULL);
+                                         dev, obj, NULL, NULL);
 }
 
 static void switchdev_port_obj_del_deferred(struct net_device *dev,