luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[EMATCH]: Remove feature ifdefs in meta ematch.

Browse Source 
Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2005-07-24 19:44:23 -07:00 committed by David S. Miller
parent 48647feed9
commit 7686ee1ad9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/sched/em_meta.c
View File

@ -209,12 +209,14 @@ META_COLLECTOR(int_maclen)
* Netfilter * Netfilter
**************************************************************************/ **************************************************************************/
#ifdef CONFIG_NETFILTER
META_COLLECTOR(int_nfmark) META_COLLECTOR(int_nfmark)
{ {
#ifdef CONFIG_NETFILTER
dst->value = skb->nfmark; dst->value = skb->nfmark;
} #else
dst->value = 0;
#endif #endif
}
/************************************************************************** /**************************************************************************
* Traffic Control * Traffic Control
@ -229,15 +231,17 @@ META_COLLECTOR(int_tcindex)
* Routing * Routing
**************************************************************************/ **************************************************************************/
#ifdef CONFIG_NET_CLS_ROUTE
META_COLLECTOR(int_rtclassid) META_COLLECTOR(int_rtclassid)
{ {
if (unlikely(skb->dst == NULL)) if (unlikely(skb->dst == NULL))
*err = -1; *err = -1;
else else
#ifdef CONFIG_NET_CLS_ROUTE
dst->value = skb->dst->tclassid; dst->value = skb->dst->tclassid;
} #else
dst->value = 0;
#endif #endif
}
META_COLLECTOR(int_rtiif) 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(PKTLEN)] = META_FUNC(int_pktlen),
[META_ID(DATALEN)] = META_FUNC(int_datalen), [META_ID(DATALEN)] = META_FUNC(int_datalen),
[META_ID(MACLEN)] = META_FUNC(int_maclen), [META_ID(MACLEN)] = META_FUNC(int_maclen),
#ifdef CONFIG_NETFILTER
[META_ID(NFMARK)] = META_FUNC(int_nfmark), [META_ID(NFMARK)] = META_FUNC(int_nfmark),
#endif
[META_ID(TCINDEX)] = META_FUNC(int_tcindex), [META_ID(TCINDEX)] = META_FUNC(int_tcindex),
#ifdef CONFIG_NET_CLS_ROUTE
[META_ID(RTCLASSID)] = META_FUNC(int_rtclassid), [META_ID(RTCLASSID)] = META_FUNC(int_rtclassid),
#endif
[META_ID(RTIIF)] = META_FUNC(int_rtiif), [META_ID(RTIIF)] = META_FUNC(int_rtiif),
[META_ID(SK_FAMILY)] = META_FUNC(int_sk_family), [META_ID(SK_FAMILY)] = META_FUNC(int_sk_family),
[META_ID(SK_STATE)] = META_FUNC(int_sk_state), [META_ID(SK_STATE)] = META_FUNC(int_sk_state),