net_sched: move tc_action into tcf_common

[cascardo/linux.git] / include / net / tc_act / tc_skbedit.h

diff --git a/include/net/tc_act/tc_skbedit.h b/include/net/tc_act/tc_skbedit.h
index b496d5a..9e05489 100644 (file)
--- a/include/net/tc_act/tc_skbedit.h
+++ b/include/net/tc_act/tc_skbedit.h
@@ -24,14 +24,13 @@
 
 struct tcf_skbedit {
        struct tcf_common       common;
-       u32                     flags;
-       u32                     priority;
-       u32                     mark;
-       u16                     queue_mapping;
-       /* XXX: 16-bit pad here? */
+       u32             flags;
+       u32             priority;
+       u32             mark;
+       u16             queue_mapping;
+       u16             ptype;
 };
-#define to_skbedit(a) \
-       container_of(a->priv, struct tcf_skbedit, common)
+#define to_skbedit(a) ((struct tcf_skbedit *)a)
 
 /* Return true iff action is mark */
 static inline bool is_tcf_skbedit_mark(const struct tc_action *a)