Commit a98c957a authored by David S. Miller's avatar David S. Miller Committed by David S. Miller

[PKT_SCHED]: Rip out requeue stat addition, user ABI breaker.

parent d2b21b58
...@@ -37,13 +37,6 @@ struct tc_stats ...@@ -37,13 +37,6 @@ struct tc_stats
__u32 bps; /* Current flow byte rate */ __u32 bps; /* Current flow byte rate */
__u32 pps; /* Current flow packet rate */ __u32 pps; /* Current flow packet rate */
__u32 qlen; __u32 qlen;
#ifdef CONFIG_NET_CLS_ACT
/* eventually remove the define here; adding this(useful)
field at least fixes the 8 byte layout problems we
have with MIPS and PPC because we have a u64
*/
__u32 reqs; /* number of requeues happened */
#endif
__u32 backlog; __u32 backlog;
#ifdef __KERNEL__ #ifdef __KERNEL__
spinlock_t *lock; spinlock_t *lock;
......
...@@ -1798,9 +1798,6 @@ hfsc_requeue(struct sk_buff *skb, struct Qdisc *sch) ...@@ -1798,9 +1798,6 @@ hfsc_requeue(struct sk_buff *skb, struct Qdisc *sch)
{ {
struct hfsc_sched *q = (struct hfsc_sched *)sch->data; struct hfsc_sched *q = (struct hfsc_sched *)sch->data;
#ifdef CONFIG_NET_CLS_ACT
sch->stats.reqs++;
#endif
__skb_queue_head(&q->requeue, skb); __skb_queue_head(&q->requeue, skb);
sch->q.qlen++; sch->q.qlen++;
return NET_XMIT_SUCCESS; return NET_XMIT_SUCCESS;
......
...@@ -763,9 +763,6 @@ static int htb_requeue(struct sk_buff *skb, struct Qdisc *sch) ...@@ -763,9 +763,6 @@ static int htb_requeue(struct sk_buff *skb, struct Qdisc *sch)
struct htb_class *cl = htb_classify(skb,sch, &ret); struct htb_class *cl = htb_classify(skb,sch, &ret);
struct sk_buff *tskb; struct sk_buff *tskb;
#ifdef CONFIG_NET_CLS_ACT
sch->stats.reqs++;
#endif
if (cl == HTB_DIRECT || !cl) { if (cl == HTB_DIRECT || !cl) {
/* enqueue to helper queue */ /* enqueue to helper queue */
if (q->direct_queue.qlen < q->direct_qlen && cl) { if (q->direct_queue.qlen < q->direct_qlen && cl) {
......
...@@ -133,9 +133,6 @@ prio_requeue(struct sk_buff *skb, struct Qdisc* sch) ...@@ -133,9 +133,6 @@ prio_requeue(struct sk_buff *skb, struct Qdisc* sch)
struct Qdisc *qdisc; struct Qdisc *qdisc;
int ret = NET_XMIT_DROP; int ret = NET_XMIT_DROP;
#ifdef CONFIG_NET_CLS_ACT
sch->stats.reqs++;
#endif
qdisc = prio_classify(skb, sch, &ret); qdisc = prio_classify(skb, sch, &ret);
if (qdisc == NULL) if (qdisc == NULL)
goto dropped; goto dropped;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment