Skip to content

Commit

Permalink
switchdev: rename SWITCHDEV_OBJ_* enum values to SWITCHDEV_OBJ_ID_*
Browse files Browse the repository at this point in the history 
Suggested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Scott Feldman <sfeldma@gmail.com>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Oct 3, 2015
1 parent c3fc7ac commit 57d8083
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 35 deletions.
6 changes: 3 additions & 3 deletions Documentation/networking/switchdev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ entries are installed, for example, using iproute2 bridge cmd:
bridge fdb add ADDR dev DEV [vlan VID] [self]

The driver should use the helper switchdev_port_fdb_xxx ops for ndo_fdb_xxx
ops, and handle add/delete/dump of SWITCHDEV_OBJ_PORT_FDB object using
ops, and handle add/delete/dump of SWITCHDEV_OBJ_ID_PORT_FDB object using
switchdev_port_obj_xxx ops.

XXX: what should be done if offloading this rule to hardware fails (for
Expand Down Expand Up @@ -316,9 +316,9 @@ SWITCHDEV_OBJ_IPV[4|6]_FIB object using switchdev_port_obj_xxx ops.
switchdev_port_obj_add is used for both adding a new FIB entry to the device,
or modifying an existing entry on the device.

XXX: Currently, only SWITCHDEV_OBJ_IPV4_FIB objects are supported.
XXX: Currently, only SWITCHDEV_OBJ_ID_IPV4_FIB objects are supported.

SWITCHDEV_OBJ_IPV4_FIB object passes:
SWITCHDEV_OBJ_ID_IPV4_FIB object passes:

struct switchdev_obj_ipv4_fib { /* IPV4_FIB */
u32 dst;
Expand Down
16 changes: 8 additions & 8 deletions drivers/net/ethernet/rocker/rocker.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4445,16 +4445,16 @@ static int rocker_port_obj_add(struct net_device *dev,
int err = 0;

switch (id) {
case SWITCHDEV_OBJ_PORT_VLAN:
case SWITCHDEV_OBJ_ID_PORT_VLAN:
err = rocker_port_vlans_add(rocker_port, trans, obj);
break;
case SWITCHDEV_OBJ_IPV4_FIB:
case SWITCHDEV_OBJ_ID_IPV4_FIB:
fib4 = obj;
err = rocker_port_fib_ipv4(rocker_port, trans,
htonl(fib4->dst), fib4->dst_len,
fib4->fi, fib4->tb_id, 0);
break;
case SWITCHDEV_OBJ_PORT_FDB:
case SWITCHDEV_OBJ_ID_PORT_FDB:
err = rocker_port_fdb_add(rocker_port, trans, obj);
break;
default:
Expand Down Expand Up @@ -4515,17 +4515,17 @@ static int rocker_port_obj_del(struct net_device *dev,
int err = 0;

switch (id) {
case SWITCHDEV_OBJ_PORT_VLAN:
case SWITCHDEV_OBJ_ID_PORT_VLAN:
err = rocker_port_vlans_del(rocker_port, obj);
break;
case SWITCHDEV_OBJ_IPV4_FIB:
case SWITCHDEV_OBJ_ID_IPV4_FIB:
fib4 = obj;
err = rocker_port_fib_ipv4(rocker_port, NULL,
htonl(fib4->dst), fib4->dst_len,
fib4->fi, fib4->tb_id,
ROCKER_OP_FLAG_REMOVE);
break;
case SWITCHDEV_OBJ_PORT_FDB:
case SWITCHDEV_OBJ_ID_PORT_FDB:
err = rocker_port_fdb_del(rocker_port, NULL, obj);
break;
default:
Expand Down Expand Up @@ -4594,10 +4594,10 @@ static int rocker_port_obj_dump(struct net_device *dev,
int err = 0;

switch (id) {
case SWITCHDEV_OBJ_PORT_FDB:
case SWITCHDEV_OBJ_ID_PORT_FDB:
err = rocker_port_fdb_dump(rocker_port, obj, cb);
break;
case SWITCHDEV_OBJ_PORT_VLAN:
case SWITCHDEV_OBJ_ID_PORT_VLAN:
err = rocker_port_vlan_dump(rocker_port, obj, cb);
break;
default:
Expand Down
14 changes: 7 additions & 7 deletions include/net/switchdev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,20 @@ struct switchdev_attr {
struct fib_info;

enum switchdev_obj_id {
SWITCHDEV_OBJ_UNDEFINED,
SWITCHDEV_OBJ_PORT_VLAN,
SWITCHDEV_OBJ_IPV4_FIB,
SWITCHDEV_OBJ_PORT_FDB,
SWITCHDEV_OBJ_ID_UNDEFINED,
SWITCHDEV_OBJ_ID_PORT_VLAN,
SWITCHDEV_OBJ_ID_IPV4_FIB,
SWITCHDEV_OBJ_ID_PORT_FDB,
};

/* SWITCHDEV_OBJ_PORT_VLAN */
/* SWITCHDEV_OBJ_ID_PORT_VLAN */
struct switchdev_obj_vlan {
u16 flags;
u16 vid_begin;
u16 vid_end;
};

/* SWITCHDEV_OBJ_IPV4_FIB */
/* SWITCHDEV_OBJ_ID_IPV4_FIB */
struct switchdev_obj_ipv4_fib {
u32 dst;
int dst_len;
Expand All @@ -82,7 +82,7 @@ struct switchdev_obj_ipv4_fib {
u32 tb_id;
};

/* SWITCHDEV_OBJ_PORT_FDB */
/* SWITCHDEV_OBJ_ID_PORT_FDB */
struct switchdev_obj_fdb {
const unsigned char *addr;
u16 vid;
Expand Down
2 changes: 1 addition & 1 deletion net/bridge/br_fdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ static void fdb_del_external_learn(struct net_bridge_fdb_entry *f)
.vid = f->vlan_id,
};

switchdev_port_obj_del(f->dst->dev, SWITCHDEV_OBJ_PORT_FDB, &fdb);
switchdev_port_obj_del(f->dst->dev, SWITCHDEV_OBJ_ID_PORT_FDB, &fdb);
}

static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f)
Expand Down
6 changes: 4 additions & 2 deletions net/bridge/br_vlan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br,
.vid_end = vid,
};

err = switchdev_port_obj_add(dev, SWITCHDEV_OBJ_PORT_VLAN, &v);
err = switchdev_port_obj_add(dev, SWITCHDEV_OBJ_ID_PORT_VLAN,
&v);
if (err == -EOPNOTSUPP)
err = 0;
}
Expand Down Expand Up @@ -136,7 +137,8 @@ static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br,
.vid_end = vid,
};

err = switchdev_port_obj_del(dev, SWITCHDEV_OBJ_PORT_VLAN, &v);
err = switchdev_port_obj_del(dev, SWITCHDEV_OBJ_ID_PORT_VLAN,
&v);
if (err == -EOPNOTSUPP)
err = 0;
}
Expand Down
12 changes: 6 additions & 6 deletions net/dsa/slave.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,10 +485,10 @@ static int dsa_slave_port_obj_add(struct net_device *dev,
*/

switch (id) {
case SWITCHDEV_OBJ_PORT_FDB:
case SWITCHDEV_OBJ_ID_PORT_FDB:
err = dsa_slave_port_fdb_add(dev, obj, trans);
break;
case SWITCHDEV_OBJ_PORT_VLAN:
case SWITCHDEV_OBJ_ID_PORT_VLAN:
err = dsa_slave_port_vlan_add(dev, obj, trans);
break;
default:
Expand All @@ -505,10 +505,10 @@ static int dsa_slave_port_obj_del(struct net_device *dev,
int err;

switch (id) {
case SWITCHDEV_OBJ_PORT_FDB:
case SWITCHDEV_OBJ_ID_PORT_FDB:
err = dsa_slave_port_fdb_del(dev, obj);
break;
case SWITCHDEV_OBJ_PORT_VLAN:
case SWITCHDEV_OBJ_ID_PORT_VLAN:
err = dsa_slave_port_vlan_del(dev, obj);
break;
default:
Expand All @@ -526,10 +526,10 @@ static int dsa_slave_port_obj_dump(struct net_device *dev,
int err;

switch (id) {
case SWITCHDEV_OBJ_PORT_FDB:
case SWITCHDEV_OBJ_ID_PORT_FDB:
err = dsa_slave_port_fdb_dump(dev, obj, cb);
break;
case SWITCHDEV_OBJ_PORT_VLAN:
case SWITCHDEV_OBJ_ID_PORT_VLAN:
err = dsa_slave_port_vlan_dump(dev, obj, cb);
break;
default:
Expand Down
16 changes: 8 additions & 8 deletions net/switchdev/switchdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ static int switchdev_port_vlan_fill(struct sk_buff *skb, struct net_device *dev,

if ((filter_mask & RTEXT_FILTER_BRVLAN) ||
(filter_mask & RTEXT_FILTER_BRVLAN_COMPRESSED)) {
err = switchdev_port_obj_dump(dev, SWITCHDEV_OBJ_PORT_VLAN,
err = switchdev_port_obj_dump(dev, SWITCHDEV_OBJ_ID_PORT_VLAN,
&dump.vlan,
switchdev_port_vlan_dump_cb);
if (err)
Expand Down Expand Up @@ -725,7 +725,7 @@ static int switchdev_port_br_afspec(struct net_device *dev,
vlan.vid_end = vinfo->vid;
if (vlan.vid_end <= vlan.vid_begin)
return -EINVAL;
err = f(dev, SWITCHDEV_OBJ_PORT_VLAN, &vlan);
err = f(dev, SWITCHDEV_OBJ_ID_PORT_VLAN, &vlan);
if (err)
return err;
memset(&vlan, 0, sizeof(vlan));
Expand All @@ -734,7 +734,7 @@ static int switchdev_port_br_afspec(struct net_device *dev,
return -EINVAL;
vlan.vid_begin = vinfo->vid;
vlan.vid_end = vinfo->vid;
err = f(dev, SWITCHDEV_OBJ_PORT_VLAN, &vlan);
err = f(dev, SWITCHDEV_OBJ_ID_PORT_VLAN, &vlan);
if (err)
return err;
memset(&vlan, 0, sizeof(vlan));
Expand Down Expand Up @@ -824,7 +824,7 @@ int switchdev_port_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
.vid = vid,
};

return switchdev_port_obj_add(dev, SWITCHDEV_OBJ_PORT_FDB, &fdb);
return switchdev_port_obj_add(dev, SWITCHDEV_OBJ_ID_PORT_FDB, &fdb);
}
EXPORT_SYMBOL_GPL(switchdev_port_fdb_add);

Expand All @@ -848,7 +848,7 @@ int switchdev_port_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
.vid = vid,
};

return switchdev_port_obj_del(dev, SWITCHDEV_OBJ_PORT_FDB, &fdb);
return switchdev_port_obj_del(dev, SWITCHDEV_OBJ_ID_PORT_FDB, &fdb);
}
EXPORT_SYMBOL_GPL(switchdev_port_fdb_del);

Expand Down Expand Up @@ -926,7 +926,7 @@ int switchdev_port_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
.idx = idx,
};

switchdev_port_obj_dump(dev, SWITCHDEV_OBJ_PORT_FDB, &dump.fdb,
switchdev_port_obj_dump(dev, SWITCHDEV_OBJ_ID_PORT_FDB, &dump.fdb,
switchdev_port_fdb_dump_cb);
return dump.idx;
}
Expand Down Expand Up @@ -1033,7 +1033,7 @@ int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
if (!dev)
return 0;

err = switchdev_port_obj_add(dev, SWITCHDEV_OBJ_IPV4_FIB, &ipv4_fib);
err = switchdev_port_obj_add(dev, SWITCHDEV_OBJ_ID_IPV4_FIB, &ipv4_fib);
if (!err)
fi->fib_flags |= RTNH_F_OFFLOAD;

Expand Down Expand Up @@ -1075,7 +1075,7 @@ int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
if (!dev)
return 0;

err = switchdev_port_obj_del(dev, SWITCHDEV_OBJ_IPV4_FIB, &ipv4_fib);
err = switchdev_port_obj_del(dev, SWITCHDEV_OBJ_ID_IPV4_FIB, &ipv4_fib);
if (!err)
fi->fib_flags &= ~RTNH_F_OFFLOAD;

Expand Down

0 comments on commit 57d8083

Please sign in to comment.