Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[karo-tx-linux.git] / include / net / tc_act / tc_gact.h

diff --git a/include/net/tc_act/tc_gact.h b/include/net/tc_act/tc_gact.h
index 59f0d9628ad1c4fd60a9f75f08e034835251cca1..9e3f6767b80e5de5213a8a9b74ae6f4446021046 100644 (file)
--- a/include/net/tc_act/tc_gact.h
+++ b/include/net/tc_act/tc_gact.h
@@ -3,15 +3,15 @@
 
 #include <net/act_api.h>
 
-struct tcf_gact
-{
-        tca_gen(gact);
+struct tcf_gact {
+       struct tcf_common       common;
 #ifdef CONFIG_GACT_PROB
-        u16                 ptype;
-        u16                 pval;
-        int                 paction;
+        u16                    tcfg_ptype;
+        u16                    tcfg_pval;
+        int                    tcfg_paction;
 #endif
-                                                                                
 };
-                                                                                
-#endif
+#define to_gact(pc) \
+       container_of(pc, struct tcf_gact, common)
+
+#endif /* __NET_TC_GACT_H */