Commit ab069002 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller

net: switchdev: abstract object in add/del ops

Similar to the notifier_call callback of a notifier_block, change the
function signature of switchdev add and del operations to:

    int switchdev_port_obj_add/del(struct net_device *dev,
                                   enum switchdev_obj_id id, void *obj);

This allows the caller to pass a specific switchdev_obj_* structure
instead of the generic switchdev_obj one.

Drivers implementation of these operations and switchdev have been
changed accordingly.
Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 25f07adc
...@@ -4437,26 +4437,25 @@ static int rocker_port_fdb_add(struct rocker_port *rocker_port, ...@@ -4437,26 +4437,25 @@ static int rocker_port_fdb_add(struct rocker_port *rocker_port,
} }
static int rocker_port_obj_add(struct net_device *dev, static int rocker_port_obj_add(struct net_device *dev,
struct switchdev_obj *obj, enum switchdev_obj_id id, const void *obj,
struct switchdev_trans *trans) struct switchdev_trans *trans)
{ {
struct rocker_port *rocker_port = netdev_priv(dev); struct rocker_port *rocker_port = netdev_priv(dev);
const struct switchdev_obj_ipv4_fib *fib4; const struct switchdev_obj_ipv4_fib *fib4;
int err = 0; int err = 0;
switch (obj->id) { switch (id) {
case SWITCHDEV_OBJ_PORT_VLAN: case SWITCHDEV_OBJ_PORT_VLAN:
err = rocker_port_vlans_add(rocker_port, trans, err = rocker_port_vlans_add(rocker_port, trans, obj);
&obj->u.vlan);
break; break;
case SWITCHDEV_OBJ_IPV4_FIB: case SWITCHDEV_OBJ_IPV4_FIB:
fib4 = &obj->u.ipv4_fib; fib4 = obj;
err = rocker_port_fib_ipv4(rocker_port, trans, err = rocker_port_fib_ipv4(rocker_port, trans,
htonl(fib4->dst), fib4->dst_len, htonl(fib4->dst), fib4->dst_len,
fib4->fi, fib4->tb_id, 0); fib4->fi, fib4->tb_id, 0);
break; break;
case SWITCHDEV_OBJ_PORT_FDB: case SWITCHDEV_OBJ_PORT_FDB:
err = rocker_port_fdb_add(rocker_port, trans, &obj->u.fdb); err = rocker_port_fdb_add(rocker_port, trans, obj);
break; break;
default: default:
err = -EOPNOTSUPP; err = -EOPNOTSUPP;
...@@ -4509,25 +4508,25 @@ static int rocker_port_fdb_del(struct rocker_port *rocker_port, ...@@ -4509,25 +4508,25 @@ static int rocker_port_fdb_del(struct rocker_port *rocker_port,
} }
static int rocker_port_obj_del(struct net_device *dev, static int rocker_port_obj_del(struct net_device *dev,
struct switchdev_obj *obj) enum switchdev_obj_id id, const void *obj)
{ {
struct rocker_port *rocker_port = netdev_priv(dev); struct rocker_port *rocker_port = netdev_priv(dev);
const struct switchdev_obj_ipv4_fib *fib4; const struct switchdev_obj_ipv4_fib *fib4;
int err = 0; int err = 0;
switch (obj->id) { switch (id) {
case SWITCHDEV_OBJ_PORT_VLAN: case SWITCHDEV_OBJ_PORT_VLAN:
err = rocker_port_vlans_del(rocker_port, &obj->u.vlan); err = rocker_port_vlans_del(rocker_port, obj);
break; break;
case SWITCHDEV_OBJ_IPV4_FIB: case SWITCHDEV_OBJ_IPV4_FIB:
fib4 = &obj->u.ipv4_fib; fib4 = obj;
err = rocker_port_fib_ipv4(rocker_port, NULL, err = rocker_port_fib_ipv4(rocker_port, NULL,
htonl(fib4->dst), fib4->dst_len, htonl(fib4->dst), fib4->dst_len,
fib4->fi, fib4->tb_id, fib4->fi, fib4->tb_id,
ROCKER_OP_FLAG_REMOVE); ROCKER_OP_FLAG_REMOVE);
break; break;
case SWITCHDEV_OBJ_PORT_FDB: case SWITCHDEV_OBJ_PORT_FDB:
err = rocker_port_fdb_del(rocker_port, NULL, &obj->u.fdb); err = rocker_port_fdb_del(rocker_port, NULL, obj);
break; break;
default: default:
err = -EOPNOTSUPP; err = -EOPNOTSUPP;
......
...@@ -115,10 +115,12 @@ struct switchdev_ops { ...@@ -115,10 +115,12 @@ struct switchdev_ops {
struct switchdev_attr *attr, struct switchdev_attr *attr,
struct switchdev_trans *trans); struct switchdev_trans *trans);
int (*switchdev_port_obj_add)(struct net_device *dev, int (*switchdev_port_obj_add)(struct net_device *dev,
struct switchdev_obj *obj, enum switchdev_obj_id id,
const void *obj,
struct switchdev_trans *trans); struct switchdev_trans *trans);
int (*switchdev_port_obj_del)(struct net_device *dev, int (*switchdev_port_obj_del)(struct net_device *dev,
struct switchdev_obj *obj); enum switchdev_obj_id id,
const void *obj);
int (*switchdev_port_obj_dump)(struct net_device *dev, int (*switchdev_port_obj_dump)(struct net_device *dev,
enum switchdev_obj_id id, void *obj, enum switchdev_obj_id id, void *obj,
int (*cb)(void *obj)); int (*cb)(void *obj));
...@@ -151,8 +153,10 @@ int switchdev_port_attr_get(struct net_device *dev, ...@@ -151,8 +153,10 @@ int switchdev_port_attr_get(struct net_device *dev,
struct switchdev_attr *attr); struct switchdev_attr *attr);
int switchdev_port_attr_set(struct net_device *dev, int switchdev_port_attr_set(struct net_device *dev,
struct switchdev_attr *attr); struct switchdev_attr *attr);
int switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj); int switchdev_port_obj_add(struct net_device *dev, enum switchdev_obj_id id,
int switchdev_port_obj_del(struct net_device *dev, struct switchdev_obj *obj); const void *obj);
int switchdev_port_obj_del(struct net_device *dev, enum switchdev_obj_id id,
const void *obj);
int switchdev_port_obj_dump(struct net_device *dev, enum switchdev_obj_id id, int switchdev_port_obj_dump(struct net_device *dev, enum switchdev_obj_id id,
void *obj, int (*cb)(void *obj)); void *obj, int (*cb)(void *obj));
int register_switchdev_notifier(struct notifier_block *nb); int register_switchdev_notifier(struct notifier_block *nb);
...@@ -199,13 +203,15 @@ static inline int switchdev_port_attr_set(struct net_device *dev, ...@@ -199,13 +203,15 @@ static inline int switchdev_port_attr_set(struct net_device *dev,
} }
static inline int switchdev_port_obj_add(struct net_device *dev, static inline int switchdev_port_obj_add(struct net_device *dev,
struct switchdev_obj *obj) enum switchdev_obj_id id,
const void *obj)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
static inline int switchdev_port_obj_del(struct net_device *dev, static inline int switchdev_port_obj_del(struct net_device *dev,
struct switchdev_obj *obj) enum switchdev_obj_id id,
const void *obj)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
......
...@@ -133,15 +133,12 @@ static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr) ...@@ -133,15 +133,12 @@ static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr)
static void fdb_del_external_learn(struct net_bridge_fdb_entry *f) static void fdb_del_external_learn(struct net_bridge_fdb_entry *f)
{ {
struct switchdev_obj obj = { struct switchdev_obj_fdb fdb = {
.id = SWITCHDEV_OBJ_PORT_FDB,
.u.fdb = {
.addr = f->addr.addr, .addr = f->addr.addr,
.vid = f->vlan_id, .vid = f->vlan_id,
},
}; };
switchdev_port_obj_del(f->dst->dev, &obj); switchdev_port_obj_del(f->dst->dev, SWITCHDEV_OBJ_PORT_FDB, &fdb);
} }
static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f) static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f)
......
...@@ -80,16 +80,13 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br, ...@@ -80,16 +80,13 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br,
if (ops->ndo_vlan_rx_add_vid) { if (ops->ndo_vlan_rx_add_vid) {
err = vlan_vid_add(dev, br->vlan_proto, vid); err = vlan_vid_add(dev, br->vlan_proto, vid);
} else { } else {
struct switchdev_obj vlan_obj = { struct switchdev_obj_vlan v = {
.id = SWITCHDEV_OBJ_PORT_VLAN,
.u.vlan = {
.flags = flags, .flags = flags,
.vid_begin = vid, .vid_begin = vid,
.vid_end = vid, .vid_end = vid,
},
}; };
err = switchdev_port_obj_add(dev, &vlan_obj); err = switchdev_port_obj_add(dev, SWITCHDEV_OBJ_PORT_VLAN, &v);
if (err == -EOPNOTSUPP) if (err == -EOPNOTSUPP)
err = 0; err = 0;
} }
...@@ -132,15 +129,12 @@ static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br, ...@@ -132,15 +129,12 @@ static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br,
if (ops->ndo_vlan_rx_kill_vid) { if (ops->ndo_vlan_rx_kill_vid) {
vlan_vid_del(dev, br->vlan_proto, vid); vlan_vid_del(dev, br->vlan_proto, vid);
} else { } else {
struct switchdev_obj vlan_obj = { struct switchdev_obj_vlan v = {
.id = SWITCHDEV_OBJ_PORT_VLAN,
.u.vlan = {
.vid_begin = vid, .vid_begin = vid,
.vid_end = vid, .vid_end = vid,
},
}; };
err = switchdev_port_obj_del(dev, &vlan_obj); err = switchdev_port_obj_del(dev, SWITCHDEV_OBJ_PORT_VLAN, &v);
if (err == -EOPNOTSUPP) if (err == -EOPNOTSUPP)
err = 0; err = 0;
} }
......
...@@ -242,10 +242,9 @@ static int dsa_bridge_check_vlan_range(struct dsa_switch *ds, ...@@ -242,10 +242,9 @@ static int dsa_bridge_check_vlan_range(struct dsa_switch *ds,
} }
static int dsa_slave_port_vlan_add(struct net_device *dev, static int dsa_slave_port_vlan_add(struct net_device *dev,
struct switchdev_obj *obj, const struct switchdev_obj_vlan *vlan,
struct switchdev_trans *trans) struct switchdev_trans *trans)
{ {
struct switchdev_obj_vlan *vlan = &obj->u.vlan;
struct dsa_slave_priv *p = netdev_priv(dev); struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent; struct dsa_switch *ds = p->parent;
u16 vid; u16 vid;
...@@ -279,9 +278,8 @@ static int dsa_slave_port_vlan_add(struct net_device *dev, ...@@ -279,9 +278,8 @@ static int dsa_slave_port_vlan_add(struct net_device *dev,
} }
static int dsa_slave_port_vlan_del(struct net_device *dev, static int dsa_slave_port_vlan_del(struct net_device *dev,
struct switchdev_obj *obj) const struct switchdev_obj_vlan *vlan)
{ {
struct switchdev_obj_vlan *vlan = &obj->u.vlan;
struct dsa_slave_priv *p = netdev_priv(dev); struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent; struct dsa_switch *ds = p->parent;
u16 vid; u16 vid;
...@@ -343,10 +341,9 @@ static int dsa_slave_port_vlan_dump(struct net_device *dev, ...@@ -343,10 +341,9 @@ static int dsa_slave_port_vlan_dump(struct net_device *dev,
} }
static int dsa_slave_port_fdb_add(struct net_device *dev, static int dsa_slave_port_fdb_add(struct net_device *dev,
struct switchdev_obj *obj, const struct switchdev_obj_fdb *fdb,
struct switchdev_trans *trans) struct switchdev_trans *trans)
{ {
struct switchdev_obj_fdb *fdb = &obj->u.fdb;
struct dsa_slave_priv *p = netdev_priv(dev); struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent; struct dsa_switch *ds = p->parent;
int ret = -EOPNOTSUPP; int ret = -EOPNOTSUPP;
...@@ -360,9 +357,8 @@ static int dsa_slave_port_fdb_add(struct net_device *dev, ...@@ -360,9 +357,8 @@ static int dsa_slave_port_fdb_add(struct net_device *dev,
} }
static int dsa_slave_port_fdb_del(struct net_device *dev, static int dsa_slave_port_fdb_del(struct net_device *dev,
struct switchdev_obj *obj) const struct switchdev_obj_fdb *fdb)
{ {
struct switchdev_obj_fdb *fdb = &obj->u.fdb;
struct dsa_slave_priv *p = netdev_priv(dev); struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent; struct dsa_switch *ds = p->parent;
int ret = -EOPNOTSUPP; int ret = -EOPNOTSUPP;
...@@ -473,7 +469,7 @@ static int dsa_slave_port_attr_set(struct net_device *dev, ...@@ -473,7 +469,7 @@ static int dsa_slave_port_attr_set(struct net_device *dev,
} }
static int dsa_slave_port_obj_add(struct net_device *dev, static int dsa_slave_port_obj_add(struct net_device *dev,
struct switchdev_obj *obj, enum switchdev_obj_id id, const void *obj,
struct switchdev_trans *trans) struct switchdev_trans *trans)
{ {
int err; int err;
...@@ -483,7 +479,7 @@ static int dsa_slave_port_obj_add(struct net_device *dev, ...@@ -483,7 +479,7 @@ static int dsa_slave_port_obj_add(struct net_device *dev,
* supported, return -EOPNOTSUPP. * supported, return -EOPNOTSUPP.
*/ */
switch (obj->id) { switch (id) {
case SWITCHDEV_OBJ_PORT_FDB: case SWITCHDEV_OBJ_PORT_FDB:
err = dsa_slave_port_fdb_add(dev, obj, trans); err = dsa_slave_port_fdb_add(dev, obj, trans);
break; break;
...@@ -499,11 +495,11 @@ static int dsa_slave_port_obj_add(struct net_device *dev, ...@@ -499,11 +495,11 @@ static int dsa_slave_port_obj_add(struct net_device *dev,
} }
static int dsa_slave_port_obj_del(struct net_device *dev, static int dsa_slave_port_obj_del(struct net_device *dev,
struct switchdev_obj *obj) enum switchdev_obj_id id, const void *obj)
{ {
int err; int err;
switch (obj->id) { switch (id) {
case SWITCHDEV_OBJ_PORT_FDB: case SWITCHDEV_OBJ_PORT_FDB:
err = dsa_slave_port_fdb_del(dev, obj); err = dsa_slave_port_fdb_del(dev, obj);
break; break;
......
...@@ -270,7 +270,7 @@ int switchdev_port_attr_set(struct net_device *dev, struct switchdev_attr *attr) ...@@ -270,7 +270,7 @@ int switchdev_port_attr_set(struct net_device *dev, struct switchdev_attr *attr)
EXPORT_SYMBOL_GPL(switchdev_port_attr_set); EXPORT_SYMBOL_GPL(switchdev_port_attr_set);
static int __switchdev_port_obj_add(struct net_device *dev, static int __switchdev_port_obj_add(struct net_device *dev,
struct switchdev_obj *obj, enum switchdev_obj_id id, const void *obj,
struct switchdev_trans *trans) struct switchdev_trans *trans)
{ {
const struct switchdev_ops *ops = dev->switchdev_ops; const struct switchdev_ops *ops = dev->switchdev_ops;
...@@ -279,7 +279,7 @@ static int __switchdev_port_obj_add(struct net_device *dev, ...@@ -279,7 +279,7 @@ static int __switchdev_port_obj_add(struct net_device *dev,
int err = -EOPNOTSUPP; int err = -EOPNOTSUPP;
if (ops && ops->switchdev_port_obj_add) if (ops && ops->switchdev_port_obj_add)
return ops->switchdev_port_obj_add(dev, obj, trans); return ops->switchdev_port_obj_add(dev, id, obj, trans);
/* Switch device port(s) may be stacked under /* Switch device port(s) may be stacked under
* bond/team/vlan dev, so recurse down to add object on * bond/team/vlan dev, so recurse down to add object on
...@@ -287,7 +287,7 @@ static int __switchdev_port_obj_add(struct net_device *dev, ...@@ -287,7 +287,7 @@ static int __switchdev_port_obj_add(struct net_device *dev,
*/ */
netdev_for_each_lower_dev(dev, lower_dev, iter) { netdev_for_each_lower_dev(dev, lower_dev, iter) {
err = __switchdev_port_obj_add(lower_dev, obj, trans); err = __switchdev_port_obj_add(lower_dev, id, obj, trans);
if (err) if (err)
break; break;
} }
...@@ -299,6 +299,7 @@ static int __switchdev_port_obj_add(struct net_device *dev, ...@@ -299,6 +299,7 @@ static int __switchdev_port_obj_add(struct net_device *dev,
* switchdev_port_obj_add - Add port object * switchdev_port_obj_add - Add port object
* *
* @dev: port device * @dev: port device
* @id: object ID
* @obj: object to add * @obj: object to add
* *
* Use a 2-phase prepare-commit transaction model to ensure * Use a 2-phase prepare-commit transaction model to ensure
...@@ -307,7 +308,8 @@ static int __switchdev_port_obj_add(struct net_device *dev, ...@@ -307,7 +308,8 @@ static int __switchdev_port_obj_add(struct net_device *dev,
* *
* rtnl_lock must be held. * rtnl_lock must be held.
*/ */
int switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj) int switchdev_port_obj_add(struct net_device *dev, enum switchdev_obj_id id,
const void *obj)
{ {
struct switchdev_trans trans; struct switchdev_trans trans;
int err; int err;
...@@ -324,7 +326,7 @@ int switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj) ...@@ -324,7 +326,7 @@ int switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj)
*/ */
trans.ph_prepare = true; trans.ph_prepare = true;
err = __switchdev_port_obj_add(dev, obj, &trans); err = __switchdev_port_obj_add(dev, id, obj, &trans);
if (err) { if (err) {
/* Prepare phase failed: abort the transaction. Any /* Prepare phase failed: abort the transaction. Any
* resources reserved in the prepare phase are * resources reserved in the prepare phase are
...@@ -343,8 +345,8 @@ int switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj) ...@@ -343,8 +345,8 @@ int switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj)
*/ */
trans.ph_prepare = false; trans.ph_prepare = false;
err = __switchdev_port_obj_add(dev, obj, &trans); err = __switchdev_port_obj_add(dev, id, obj, &trans);
WARN(err, "%s: Commit of object (id=%d) failed.\n", dev->name, obj->id); WARN(err, "%s: Commit of object (id=%d) failed.\n", dev->name, id);
switchdev_trans_items_warn_destroy(dev, &trans); switchdev_trans_items_warn_destroy(dev, &trans);
return err; return err;
...@@ -355,9 +357,11 @@ EXPORT_SYMBOL_GPL(switchdev_port_obj_add); ...@@ -355,9 +357,11 @@ EXPORT_SYMBOL_GPL(switchdev_port_obj_add);
* switchdev_port_obj_del - Delete port object * switchdev_port_obj_del - Delete port object
* *
* @dev: port device * @dev: port device
* @id: object ID
* @obj: object to delete * @obj: object to delete
*/ */
int switchdev_port_obj_del(struct net_device *dev, struct switchdev_obj *obj) int switchdev_port_obj_del(struct net_device *dev, enum switchdev_obj_id id,
const void *obj)
{ {
const struct switchdev_ops *ops = dev->switchdev_ops; const struct switchdev_ops *ops = dev->switchdev_ops;
struct net_device *lower_dev; struct net_device *lower_dev;
...@@ -365,7 +369,7 @@ int switchdev_port_obj_del(struct net_device *dev, struct switchdev_obj *obj) ...@@ -365,7 +369,7 @@ int switchdev_port_obj_del(struct net_device *dev, struct switchdev_obj *obj)
int err = -EOPNOTSUPP; int err = -EOPNOTSUPP;
if (ops && ops->switchdev_port_obj_del) if (ops && ops->switchdev_port_obj_del)
return ops->switchdev_port_obj_del(dev, obj); return ops->switchdev_port_obj_del(dev, id, obj);
/* Switch device port(s) may be stacked under /* Switch device port(s) may be stacked under
* bond/team/vlan dev, so recurse down to delete object on * bond/team/vlan dev, so recurse down to delete object on
...@@ -373,7 +377,7 @@ int switchdev_port_obj_del(struct net_device *dev, struct switchdev_obj *obj) ...@@ -373,7 +377,7 @@ int switchdev_port_obj_del(struct net_device *dev, struct switchdev_obj *obj)
*/ */
netdev_for_each_lower_dev(dev, lower_dev, iter) { netdev_for_each_lower_dev(dev, lower_dev, iter) {
err = switchdev_port_obj_del(lower_dev, obj); err = switchdev_port_obj_del(lower_dev, id, obj);
if (err) if (err)
break; break;
} }
...@@ -695,14 +699,12 @@ static int switchdev_port_br_setlink_protinfo(struct net_device *dev, ...@@ -695,14 +699,12 @@ static int switchdev_port_br_setlink_protinfo(struct net_device *dev,
static int switchdev_port_br_afspec(struct net_device *dev, static int switchdev_port_br_afspec(struct net_device *dev,
struct nlattr *afspec, struct nlattr *afspec,
int (*f)(struct net_device *dev, int (*f)(struct net_device *dev,
struct switchdev_obj *obj)) enum switchdev_obj_id id,
const void *obj))
{ {
struct nlattr *attr; struct nlattr *attr;
struct bridge_vlan_info *vinfo; struct bridge_vlan_info *vinfo;
struct switchdev_obj obj = { struct switchdev_obj_vlan vlan = { 0 };
.id = SWITCHDEV_OBJ_PORT_VLAN,
};
struct switchdev_obj_vlan *vlan = &obj.u.vlan;
int rem; int rem;
int err; int err;
...@@ -712,30 +714,30 @@ static int switchdev_port_br_afspec(struct net_device *dev, ...@@ -712,30 +714,30 @@ static int switchdev_port_br_afspec(struct net_device *dev,
if (nla_len(attr) != sizeof(struct bridge_vlan_info)) if (nla_len(attr) != sizeof(struct bridge_vlan_info))
return -EINVAL; return -EINVAL;
vinfo = nla_data(attr); vinfo = nla_data(attr);
vlan->flags = vinfo->flags; vlan.flags = vinfo->flags;
if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) { if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) {
if (vlan->vid_begin) if (vlan.vid_begin)
return -EINVAL; return -EINVAL;
vlan->vid_begin = vinfo->vid; vlan.vid_begin = vinfo->vid;
} else if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_END) { } else if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_END) {
if (!vlan->vid_begin) if (!vlan.vid_begin)
return -EINVAL; return -EINVAL;
vlan->vid_end = vinfo->vid; vlan.vid_end = vinfo->vid;
if (vlan->vid_end <= vlan->vid_begin) if (vlan.vid_end <= vlan.vid_begin)
return -EINVAL; return -EINVAL;
err = f(dev, &obj); err = f(dev, SWITCHDEV_OBJ_PORT_VLAN, &vlan);
if (err) if (err)
return err; return err;
memset(vlan, 0, sizeof(*vlan)); memset(&vlan, 0, sizeof(vlan));
} else { } else {
if (vlan->vid_begin) if (vlan.vid_begin)
return -EINVAL; return -EINVAL;
vlan->vid_begin = vinfo->vid; vlan.vid_begin = vinfo->vid;
vlan->vid_end = vinfo->vid; vlan.vid_end = vinfo->vid;
err = f(dev, &obj); err = f(dev, SWITCHDEV_OBJ_PORT_VLAN, &vlan);
if (err) if (err)
return err; return err;
memset(vlan, 0, sizeof(*vlan)); memset(&vlan, 0, sizeof(vlan));
} }
} }
...@@ -817,15 +819,12 @@ int switchdev_port_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], ...@@ -817,15 +819,12 @@ int switchdev_port_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
struct net_device *dev, const unsigned char *addr, struct net_device *dev, const unsigned char *addr,
u16 vid, u16 nlm_flags) u16 vid, u16 nlm_flags)
{ {
struct switchdev_obj obj = { struct switchdev_obj_fdb fdb = {
.id = SWITCHDEV_OBJ_PORT_FDB,
.u.fdb = {
.addr = addr, .addr = addr,
.vid = vid, .vid = vid,
},
}; };
return switchdev_port_obj_add(dev, &obj); return switchdev_port_obj_add(dev, SWITCHDEV_OBJ_PORT_FDB, &fdb);
} }
EXPORT_SYMBOL_GPL(switchdev_port_fdb_add); EXPORT_SYMBOL_GPL(switchdev_port_fdb_add);
...@@ -844,15 +843,12 @@ int switchdev_port_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], ...@@ -844,15 +843,12 @@ int switchdev_port_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
struct net_device *dev, const unsigned char *addr, struct net_device *dev, const unsigned char *addr,
u16 vid) u16 vid)
{ {
struct switchdev_obj obj = { struct switchdev_obj_fdb fdb = {
.id = SWITCHDEV_OBJ_PORT_FDB,
.u.fdb = {
.addr = addr, .addr = addr,
.vid = vid, .vid = vid,
},
}; };
return switchdev_port_obj_del(dev, &obj); return switchdev_port_obj_del(dev, SWITCHDEV_OBJ_PORT_FDB, &fdb);
} }
EXPORT_SYMBOL_GPL(switchdev_port_fdb_del); EXPORT_SYMBOL_GPL(switchdev_port_fdb_del);
...@@ -1009,9 +1005,7 @@ static struct net_device *switchdev_get_dev_by_nhs(struct fib_info *fi) ...@@ -1009,9 +1005,7 @@ static struct net_device *switchdev_get_dev_by_nhs(struct fib_info *fi)
int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi, int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
u8 tos, u8 type, u32 nlflags, u32 tb_id) u8 tos, u8 type, u32 nlflags, u32 tb_id)
{ {
struct switchdev_obj fib_obj = { struct switchdev_obj_ipv4_fib ipv4_fib = {
.id = SWITCHDEV_OBJ_IPV4_FIB,
.u.ipv4_fib = {
.dst = dst, .dst = dst,
.dst_len = dst_len, .dst_len = dst_len,
.fi = fi, .fi = fi,
...@@ -1019,7 +1013,6 @@ int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi, ...@@ -1019,7 +1013,6 @@ int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
.type = type, .type = type,
.nlflags = nlflags, .nlflags = nlflags,
.tb_id = tb_id, .tb_id = tb_id,
},
}; };
struct net_device *dev; struct net_device *dev;
int err = 0; int err = 0;
...@@ -1040,7 +1033,7 @@ int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi, ...@@ -1040,7 +1033,7 @@ int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
if (!dev) if (!dev)
return 0; return 0;
err = switchdev_port_obj_add(dev, &fib_obj); err = switchdev_port_obj_add(dev, SWITCHDEV_OBJ_IPV4_FIB, &ipv4_fib);
if (!err) if (!err)
fi->fib_flags |= RTNH_F_OFFLOAD; fi->fib_flags |= RTNH_F_OFFLOAD;
...@@ -1063,9 +1056,7 @@ EXPORT_SYMBOL_GPL(switchdev_fib_ipv4_add); ...@@ -1063,9 +1056,7 @@ EXPORT_SYMBOL_GPL(switchdev_fib_ipv4_add);
int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi, int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
u8 tos, u8 type, u32 tb_id) u8 tos, u8 type, u32 tb_id)
{ {
struct switchdev_obj fib_obj = { struct switchdev_obj_ipv4_fib ipv4_fib = {
.id = SWITCHDEV_OBJ_IPV4_FIB,
.u.ipv4_fib = {
.dst = dst, .dst = dst,
.dst_len = dst_len, .dst_len = dst_len,
.fi = fi, .fi = fi,
...@@ -1073,7 +1064,6 @@ int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi, ...@@ -1073,7 +1064,6 @@ int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
.type = type, .type = type,
.nlflags = 0, .nlflags = 0,
.tb_id = tb_id, .tb_id = tb_id,
},
}; };
struct net_device *dev; struct net_device *dev;
int err = 0; int err = 0;
...@@ -1085,7 +1075,7 @@ int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi, ...@@ -1085,7 +1075,7 @@ int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
if (!dev) if (!dev)
return 0; return 0;
err = switchdev_port_obj_del(dev, &fib_obj); err = switchdev_port_obj_del(dev, SWITCHDEV_OBJ_IPV4_FIB, &ipv4_fib);
if (!err) if (!err)
fi->fib_flags &= ~RTNH_F_OFFLOAD; fi->fib_flags &= ~RTNH_F_OFFLOAD;
......
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