summaryrefslogtreecommitdiff
path: root/include/net/switchdev.h
diff options
context:
space:
mode:
authorJiri Pirko <jiri@mellanox.com>2015-09-24 11:02:42 +0300
committerDavid S. Miller <davem@davemloft.net>2015-09-25 08:59:21 +0300
commitf8db83486e316ff50f97961a82b614985645508e (patch)
tree21341c02bf5bf3f38fe44f72561d8f08d2e55e8f /include/net/switchdev.h
parent7ea6eb3f56f45cf4babae8b9a7421868e5005f17 (diff)
downloadlinux-f8db83486e316ff50f97961a82b614985645508e.tar.xz
switchdev: move transaction phase enum under transaction structure
Before it disappears completely, move transaction phase enum under transaction structure and make attr/obj structures a bit cleaner. 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.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 1e394f1176b6..368a6429198d 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -32,6 +32,7 @@ struct switchdev_trans_item {
struct switchdev_trans {
struct list_head item_list;
+ enum switchdev_trans_ph ph;
};
enum switchdev_attr_id {
@@ -43,7 +44,6 @@ enum switchdev_attr_id {
struct switchdev_attr {
enum switchdev_attr_id id;
- enum switchdev_trans_ph trans_ph;
u32 flags;
union {
struct netdev_phys_item_id ppid; /* PORT_PARENT_ID */
@@ -63,7 +63,6 @@ enum switchdev_obj_id {
struct switchdev_obj {
enum switchdev_obj_id id;
- enum switchdev_trans_ph trans_ph;
int (*cb)(struct net_device *dev, struct switchdev_obj *obj);
union {
struct switchdev_obj_vlan { /* PORT_VLAN */