summaryrefslogtreecommitdiff
path: root/include/net/switchdev.h
diff options
context:
space:
mode:
authorJiri Pirko <jiri@mellanox.com>2015-09-24 11:02:40 +0300
committerDavid S. Miller <davem@davemloft.net>2015-09-25 08:59:21 +0300
commit69f5df491e0becb75d2d795add7481a35218d657 (patch)
tree3ed228b4acf8401be9203be33cc2448152d9267c /include/net/switchdev.h
parentaee2f545f0a12399cc6bbe134d69b8994582b694 (diff)
downloadlinux-69f5df491e0becb75d2d795add7481a35218d657.tar.xz
switchdev: rename "trans" to "trans_ph".
This is temporary, name "trans" will be used for something else and "trans_ph" will eventually disappear. Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/switchdev.h')
-rw-r--r--include/net/switchdev.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 319baab3b48e..494f51097dc6 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -16,7 +16,7 @@
#define SWITCHDEV_F_NO_RECURSE BIT(0)
-enum switchdev_trans {
+enum switchdev_trans_ph {
SWITCHDEV_TRANS_NONE,
SWITCHDEV_TRANS_PREPARE,
SWITCHDEV_TRANS_ABORT,
@@ -32,7 +32,7 @@ enum switchdev_attr_id {
struct switchdev_attr {
enum switchdev_attr_id id;
- enum switchdev_trans trans;
+ enum switchdev_trans_ph trans_ph;
u32 flags;
union {
struct netdev_phys_item_id ppid; /* PORT_PARENT_ID */
@@ -52,7 +52,7 @@ enum switchdev_obj_id {
struct switchdev_obj {
enum switchdev_obj_id id;
- enum switchdev_trans trans;
+ enum switchdev_trans_ph trans_ph;
int (*cb)(struct net_device *dev, struct switchdev_obj *obj);
union {
struct switchdev_obj_vlan { /* PORT_VLAN */