Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[mirror_ubuntu-artful-kernel.git] / include / net / tc_act / tc_ife.h

diff --git a/include/net/tc_act/tc_ife.h b/include/net/tc_act/tc_ife.h
index c55facd17b7ec0b4c38ecf7e3690118056a93567..5164bd7a38fb5a6325b45fdace3e03f72f3b38cd 100644 (file)
--- a/include/net/tc_act/tc_ife.h
+++ b/include/net/tc_act/tc_ife.h
@@ -8,7 +8,7 @@
 
 #define IFE_METAHDRLEN 2
 struct tcf_ife_info {
-       struct tcf_common common;
+       struct tc_action common;
        u8 eth_dst[ETH_ALEN];
        u8 eth_src[ETH_ALEN];
        u16 eth_type;
@@ -16,8 +16,7 @@ struct tcf_ife_info {
        /* list of metaids allowed */
        struct list_head metalist;
 };
-#define to_ife(a) \
-       container_of(a->priv, struct tcf_ife_info, common)
+#define to_ife(a) ((struct tcf_ife_info *)a)
 
 struct tcf_meta_info {
        const struct tcf_meta_ops *ops;