Commit e258d919 authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller

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

Fixes: 4d429c5d ("switchdev: introduce possibility to defer obj_add/del")
Signed-off-by: default avatarScott Feldman <sfeldma@gmail.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3a7bde55
...@@ -337,6 +337,21 @@ int switchdev_port_attr_set(struct net_device *dev, ...@@ -337,6 +337,21 @@ int switchdev_port_attr_set(struct net_device *dev,
} }
EXPORT_SYMBOL_GPL(switchdev_port_attr_set); 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, static int __switchdev_port_obj_add(struct net_device *dev,
const struct switchdev_obj *obj, const struct switchdev_obj *obj,
struct switchdev_trans *trans) struct switchdev_trans *trans)
...@@ -422,7 +437,7 @@ static void switchdev_port_obj_add_deferred(struct net_device *dev, ...@@ -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, static int switchdev_port_obj_add_defer(struct net_device *dev,
const struct switchdev_obj *obj) 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); switchdev_port_obj_add_deferred);
} }
...@@ -490,7 +505,7 @@ static void switchdev_port_obj_del_deferred(struct net_device *dev, ...@@ -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, static int switchdev_port_obj_del_defer(struct net_device *dev,
const struct switchdev_obj *obj) 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); switchdev_port_obj_del_deferred);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment