switchdev: fix: pass correct obj size when deferring obj add

Fixes: 4d429c5dd ("switchdev: introduce possibility to defer obj_add/del")
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index d6b4a84a4a7974ae9e25b510ef35a95003a4eaf5..6dfd19e529387b0399ff5d10196dd6f18181a390 100644 (file)
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -337,6 +337,21 @@ int switchdev_port_attr_set(struct net_device *dev,
 }
 EXPORT_SYMBOL_GPL(switchdev_port_attr_set);
 
+static size_t switchdev_obj_size(const struct switchdev_obj *obj)
+{
+       switch (obj->id) {
+       case SWITCHDEV_OBJ_ID_PORT_VLAN:
+               return sizeof(struct switchdev_obj_port_vlan);
+       case SWITCHDEV_OBJ_ID_IPV4_FIB:
+               return sizeof(struct switchdev_obj_ipv4_fib);
+       case SWITCHDEV_OBJ_ID_PORT_FDB:
+               return sizeof(struct switchdev_obj_port_fdb);
+       default:
+               BUG();
+       }
+       return 0;
+}
+
 static int __switchdev_port_obj_add(struct net_device *dev,
                                    const struct switchdev_obj *obj,
                                    struct switchdev_trans *trans)
@@ -422,7 +437,7 @@ static void switchdev_port_obj_add_deferred(struct net_device *dev,
 static int switchdev_port_obj_add_defer(struct net_device *dev,
                                        const struct switchdev_obj *obj)
 {
-       return switchdev_deferred_enqueue(dev, obj, sizeof(*obj),
+       return switchdev_deferred_enqueue(dev, obj, switchdev_obj_size(obj),
                                          switchdev_port_obj_add_deferred);
 }
 
@@ -490,7 +505,7 @@ static void switchdev_port_obj_del_deferred(struct net_device *dev,
 static int switchdev_port_obj_del_defer(struct net_device *dev,
                                        const struct switchdev_obj *obj)
 {
-       return switchdev_deferred_enqueue(dev, obj, sizeof(*obj),
+       return switchdev_deferred_enqueue(dev, obj, switchdev_obj_size(obj),
                                          switchdev_port_obj_del_deferred);
 }