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 /net/sched/sch_ingress.c | |
| parent | 73ca4918fbb98311421259d82ef4ab44feeace43 (diff) | |
| download | linux-c3bc7cff8fddb6ff9715be8bfc3d911378c4d69d.tar.bz2 | |
[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_ingress.c')
| -rw-r--r-- | net/sched/sch_ingress.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c index cd0aab6a2a7c..51f16b0af198 100644 --- a/net/sched/sch_ingress.c +++ b/net/sched/sch_ingress.c @@ -164,31 +164,12 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch) result = TC_ACT_OK; break; } -/* backward compat */ -#else -#ifdef CONFIG_NET_CLS_POLICE - switch (result) { - case TC_POLICE_SHOT: - result = NF_DROP; - sch->qstats.drops++; - break; - case TC_POLICE_RECLASSIFY: /* DSCP remarking here ? */ - case TC_POLICE_OK: - case TC_POLICE_UNSPEC: - default: - sch->bstats.packets++; - sch->bstats.bytes += skb->len; - result = NF_ACCEPT; - break; - } - #else D2PRINTK("Overriding result to ACCEPT\n"); result = NF_ACCEPT; sch->bstats.packets++; sch->bstats.bytes += skb->len; #endif -#endif return result; } |