diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-07-15 00:03:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-07-15 00:03:05 -0700 |
| commit | c3bc7cff8fddb6ff9715be8bfc3d911378c4d69d (patch) | |
| tree | e23946fb3583ee17e95c07f6e04b5dcc498fa581 /include/net/pkt_cls.h | |
| parent | 73ca4918fbb98311421259d82ef4ab44feeace43 (diff) | |
[NET_SCHED]: Kill CONFIG_NET_CLS_POLICE
The NET_CLS_ACT option is now a full replacement for NET_CLS_POLICE,
remove the old code. The config option will be kept around to select
the equivalent NET_CLS_ACT options for a short time to allow easier
upgrades.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/pkt_cls.h')
| -rw-r--r-- | include/net/pkt_cls.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index 6c29920cbe2..7968b1d6636 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -65,8 +65,6 @@ struct tcf_exts { #ifdef CONFIG_NET_CLS_ACT struct tc_action *action; -#elif defined CONFIG_NET_CLS_POLICE - struct tcf_police *police; #endif }; @@ -91,8 +89,6 @@ tcf_exts_is_predicative(struct tcf_exts *exts) { #ifdef CONFIG_NET_CLS_ACT return !!exts->action; -#elif defined CONFIG_NET_CLS_POLICE - return !!exts->police; #else return 0; #endif @@ -129,11 +125,7 @@ tcf_exts_exec(struct sk_buff *skb, struct tcf_exts *exts, #ifdef CONFIG_NET_CLS_ACT if (exts->action) return tcf_action_exec(skb, exts->action, res); -#elif defined CONFIG_NET_CLS_POLICE - if (exts->police) - return tcf_police(skb, exts->police); #endif - return 0; } |