diff options
| author | Patrick McHardy <kaber@trash.net> | 2005-07-25 04:44:23 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-07-25 04:44:23 +0200 |
| commit | 7686ee1ad976efeddf10583f013462c66408ae51 (patch) | |
| tree | 68e8cd513ab047d4e71fcd232fdca4e5b0a69366 | |
| parent | [W1]: Do not use NFLOG netlink number. (diff) | |
| download | linux-7686ee1ad976efeddf10583f013462c66408ae51.tar.xz linux-7686ee1ad976efeddf10583f013462c66408ae51.zip | |
[EMATCH]: Remove feature ifdefs in meta ematch.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sched/em_meta.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c index a18b924743d9..00eae5f9a01a 100644 --- a/net/sched/em_meta.c +++ b/net/sched/em_meta.c @@ -209,12 +209,14 @@ META_COLLECTOR(int_maclen) * Netfilter **************************************************************************/ -#ifdef CONFIG_NETFILTER META_COLLECTOR(int_nfmark) { +#ifdef CONFIG_NETFILTER dst->value = skb->nfmark; -} +#else + dst->value = 0; #endif +} /************************************************************************** * Traffic Control @@ -229,15 +231,17 @@ META_COLLECTOR(int_tcindex) * Routing **************************************************************************/ -#ifdef CONFIG_NET_CLS_ROUTE META_COLLECTOR(int_rtclassid) { if (unlikely(skb->dst == NULL)) *err = -1; else +#ifdef CONFIG_NET_CLS_ROUTE dst->value = skb->dst->tclassid; -} +#else + dst->value = 0; #endif +} META_COLLECTOR(int_rtiif) { @@ -487,13 +491,9 @@ static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = { [META_ID(PKTLEN)] = META_FUNC(int_pktlen), [META_ID(DATALEN)] = META_FUNC(int_datalen), [META_ID(MACLEN)] = META_FUNC(int_maclen), -#ifdef CONFIG_NETFILTER [META_ID(NFMARK)] = META_FUNC(int_nfmark), -#endif [META_ID(TCINDEX)] = META_FUNC(int_tcindex), -#ifdef CONFIG_NET_CLS_ROUTE [META_ID(RTCLASSID)] = META_FUNC(int_rtclassid), -#endif [META_ID(RTIIF)] = META_FUNC(int_rtiif), [META_ID(SK_FAMILY)] = META_FUNC(int_sk_family), [META_ID(SK_STATE)] = META_FUNC(int_sk_state), |