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/sch_generic.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/sch_generic.h')
| -rw-r--r-- | include/net/sch_generic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 0153cd9d1b8..8a67f24cbe0 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -290,7 +290,7 @@ static inline int qdisc_reshape_fail(struct sk_buff *skb, struct Qdisc *sch) { sch->qstats.drops++; -#if defined(CONFIG_NET_CLS_ACT) || defined(CONFIG_NET_CLS_POLICE) +#ifdef CONFIG_NET_CLS_ACT if (sch->reshape_fail == NULL || sch->reshape_fail(skb, sch)) goto drop; |