Merge branch 'linus' into cont_syslog

[safe/jmp/linux-2.6] / include / net / tc_act / tc_ipt.h

diff --git a/include/net/tc_act/tc_ipt.h b/include/net/tc_act/tc_ipt.h
index cb37ad0..f7d25df 100644 (file)
--- a/include/net/tc_act/tc_ipt.h
+++ b/include/net/tc_act/tc_ipt.h
@@ -5,12 +5,13 @@
 
 struct xt_entry_target;
 
-struct tcf_ipt
-{
-       tca_gen(ipt);
-       u32 hook;
-       char *tname;
-       struct xt_entry_target *t;
+struct tcf_ipt {
+       struct tcf_common       common;
+       u32                     tcfi_hook;
+       char                    *tcfi_tname;
+       struct xt_entry_target  *tcfi_t;
 };
+#define to_ipt(pc) \
+       container_of(pc, struct tcf_ipt, common)
 
-#endif
+#endif /* __NET_TC_IPT_H */