diff options
Diffstat (limited to 'include/net/sch_generic.h')
-rw-r--r-- | include/net/sch_generic.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index a1fd76c22a59..62d553184e91 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h | |||
@@ -168,6 +168,7 @@ struct Qdisc_class_ops { | |||
168 | 168 | ||
169 | /* Filter manipulation */ | 169 | /* Filter manipulation */ |
170 | struct tcf_proto __rcu ** (*tcf_chain)(struct Qdisc *, unsigned long); | 170 | struct tcf_proto __rcu ** (*tcf_chain)(struct Qdisc *, unsigned long); |
171 | bool (*tcf_cl_offload)(u32 classid); | ||
171 | unsigned long (*bind_tcf)(struct Qdisc *, unsigned long, | 172 | unsigned long (*bind_tcf)(struct Qdisc *, unsigned long, |
172 | u32 classid); | 173 | u32 classid); |
173 | void (*unbind_tcf)(struct Qdisc *, unsigned long); | 174 | void (*unbind_tcf)(struct Qdisc *, unsigned long); |
@@ -691,9 +692,11 @@ static inline struct sk_buff *qdisc_peek_dequeued(struct Qdisc *sch) | |||
691 | /* we can reuse ->gso_skb because peek isn't called for root qdiscs */ | 692 | /* we can reuse ->gso_skb because peek isn't called for root qdiscs */ |
692 | if (!sch->gso_skb) { | 693 | if (!sch->gso_skb) { |
693 | sch->gso_skb = sch->dequeue(sch); | 694 | sch->gso_skb = sch->dequeue(sch); |
694 | if (sch->gso_skb) | 695 | if (sch->gso_skb) { |
695 | /* it's still part of the queue */ | 696 | /* it's still part of the queue */ |
697 | qdisc_qstats_backlog_inc(sch, sch->gso_skb); | ||
696 | sch->q.qlen++; | 698 | sch->q.qlen++; |
699 | } | ||
697 | } | 700 | } |
698 | 701 | ||
699 | return sch->gso_skb; | 702 | return sch->gso_skb; |
@@ -706,6 +709,7 @@ static inline struct sk_buff *qdisc_dequeue_peeked(struct Qdisc *sch) | |||
706 | 709 | ||
707 | if (skb) { | 710 | if (skb) { |
708 | sch->gso_skb = NULL; | 711 | sch->gso_skb = NULL; |
712 | qdisc_qstats_backlog_dec(sch, skb); | ||
709 | sch->q.qlen--; | 713 | sch->q.qlen--; |
710 | } else { | 714 | } else { |
711 | skb = sch->dequeue(sch); | 715 | skb = sch->dequeue(sch); |