diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-08-22 02:54:55 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 17:55:10 -0400 |
commit | e9ce1cd3cf6cf35b21d0ce990f2e738f35907386 (patch) | |
tree | 22a3ee7b78ae7cbf00520c66dcc389d87740069c /include/net/tc_act/tc_ipt.h | |
parent | 2e4ca75b31b6851dcc036c2cdebf3ecfe279a653 (diff) |
[PKT_SCHED]: Kill pkt_act.h inlining.
This was simply making templates of functions and mostly causing a lot
of code duplication in the classifier action modules.
We solve this more cleanly by having a common "struct tcf_common" that
hash worker functions contained once in act_api.c can work with.
Callers work with real action objects that have the common struct
plus their module specific struct members. You go from a common
object to the higher level one using a "to_foo()" macro which makes
use of container_of() to do the dirty work.
This also kills off act_generic.h which was only used by act_simple.c
and keeping it around was more work than the it's value.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/tc_act/tc_ipt.h')
-rw-r--r-- | include/net/tc_act/tc_ipt.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/include/net/tc_act/tc_ipt.h b/include/net/tc_act/tc_ipt.h index cb37ad08427f..f7d25dfcc4b7 100644 --- a/include/net/tc_act/tc_ipt.h +++ b/include/net/tc_act/tc_ipt.h | |||
@@ -5,12 +5,13 @@ | |||
5 | 5 | ||
6 | struct xt_entry_target; | 6 | struct xt_entry_target; |
7 | 7 | ||
8 | struct tcf_ipt | 8 | struct tcf_ipt { |
9 | { | 9 | struct tcf_common common; |
10 | tca_gen(ipt); | 10 | u32 tcfi_hook; |
11 | u32 hook; | 11 | char *tcfi_tname; |
12 | char *tname; | 12 | struct xt_entry_target *tcfi_t; |
13 | struct xt_entry_target *t; | ||
14 | }; | 13 | }; |
14 | #define to_ipt(pc) \ | ||
15 | container_of(pc, struct tcf_ipt, common) | ||
15 | 16 | ||
16 | #endif | 17 | #endif /* __NET_TC_IPT_H */ |