Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[linux-2.6-omap-h63xx.git] / include / net / tc_act / tc_defact.h

diff --git a/include/net/tc_act/tc_defact.h b/include/net/tc_act/tc_defact.h
index 463aa671f95d29edf4cc4af90d4de9e7be8c0ceb..65f024b809589bc638de15053257d31da5b206cc 100644 (file)
--- a/include/net/tc_act/tc_defact.h
+++ b/include/net/tc_act/tc_defact.h
@@ -3,11 +3,12 @@
 
 #include <net/act_api.h>
 
-struct tcf_defact
-{
-       tca_gen(defact);
-       u32     datalen;
-       void    *defdata;
+struct tcf_defact {
+       struct tcf_common       common;
+       u32                     tcfd_datalen;
+       void                    *tcfd_defdata;
 };
+#define to_defact(pc) \
+       container_of(pc, struct tcf_defact, common)
 
-#endif
+#endif /* __NET_TC_DEF_H */