diff options
author | Patrick McHardy <kaber@trash.net> | 2007-07-15 03:03:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-07-15 03:03:05 -0400 |
commit | c3bc7cff8fddb6ff9715be8bfc3d911378c4d69d (patch) | |
tree | e23946fb3583ee17e95c07f6e04b5dcc498fa581 /net/sched/sch_hfsc.c | |
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 'net/sched/sch_hfsc.c')
-rw-r--r-- | net/sched/sch_hfsc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index 874452c41a01..55e7e4530f43 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c | |||
@@ -1174,9 +1174,6 @@ hfsc_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr) | |||
1174 | case TC_ACT_SHOT: | 1174 | case TC_ACT_SHOT: |
1175 | return NULL; | 1175 | return NULL; |
1176 | } | 1176 | } |
1177 | #elif defined(CONFIG_NET_CLS_POLICE) | ||
1178 | if (result == TC_POLICE_SHOT) | ||
1179 | return NULL; | ||
1180 | #endif | 1177 | #endif |
1181 | if ((cl = (struct hfsc_class *)res.class) == NULL) { | 1178 | if ((cl = (struct hfsc_class *)res.class) == NULL) { |
1182 | if ((cl = hfsc_find_class(res.classid, sch)) == NULL) | 1179 | if ((cl = hfsc_find_class(res.classid, sch)) == NULL) |