diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-08-21 23:54:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 14:55:10 -0700 |
| commit | e9ce1cd3cf6cf35b21d0ce990f2e738f35907386 (patch) | |
| tree | 22a3ee7b78ae7cbf00520c66dcc389d87740069c /include/net/tc_act/tc_gact.h | |
| parent | 2e4ca75b31b6851dcc036c2cdebf3ecfe279a653 (diff) | |
| download | blackbird-op-linux-e9ce1cd3cf6cf35b21d0ce990f2e738f35907386.tar.gz blackbird-op-linux-e9ce1cd3cf6cf35b21d0ce990f2e738f35907386.zip | |
[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_gact.h')
| -rw-r--r-- | include/net/tc_act/tc_gact.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/net/tc_act/tc_gact.h b/include/net/tc_act/tc_gact.h index 59f0d9628ad1..9e3f6767b80e 100644 --- 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 */ |
