aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/rocker
diff options
context:
space:
mode:
authorJiri Pirko <jiri@mellanox.com>2015-10-01 11:03:41 +0200
committerDavid S. Miller <davem@davemloft.net>2015-10-03 04:49:36 -0700
commit57d80838dae55c1bc6ca629e471c84100513079a (patch)
tree4ab9aa8ef8563cfa8deef9a126458e3a416b4d07 /drivers/net/ethernet/rocker
parentc3fc7ac9a0b978ee8538058743d21feef25f7b33 (diff)
switchdev: rename SWITCHDEV_OBJ_* enum values to SWITCHDEV_OBJ_ID_*
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>
Diffstat (limited to 'drivers/net/ethernet/rocker')
-rw-r--r--drivers/net/ethernet/rocker/rocker.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 9773f5b65296..9b2e8bed8f83 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -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:
@@ -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:
@@ -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: