Browse Source

net_sched/sfq: update hierarchical backlog when drop packet

When sfq_enqueue() drops head packet or packet from another queue it
have to update backlog at upper qdiscs too.

Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too")
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Konstantin Khlebnikov 8 years ago
parent
commit
325d5dc3f7
1 changed files with 4 additions and 1 deletions
  1. 4 1
      net/sched/sch_sfq.c

+ 4 - 1
net/sched/sch_sfq.c

@@ -437,6 +437,7 @@ congestion_drop:
 		qdisc_drop(head, sch, to_free);
 		qdisc_drop(head, sch, to_free);
 
 
 		slot_queue_add(slot, skb);
 		slot_queue_add(slot, skb);
+		qdisc_tree_reduce_backlog(sch, 0, delta);
 		return NET_XMIT_CN;
 		return NET_XMIT_CN;
 	}
 	}
 
 
@@ -468,8 +469,10 @@ enqueue:
 	/* Return Congestion Notification only if we dropped a packet
 	/* Return Congestion Notification only if we dropped a packet
 	 * from this flow.
 	 * from this flow.
 	 */
 	 */
-	if (qlen != slot->qlen)
+	if (qlen != slot->qlen) {
+		qdisc_tree_reduce_backlog(sch, 0, dropped - qdisc_pkt_len(skb));
 		return NET_XMIT_CN;
 		return NET_XMIT_CN;
+	}
 
 
 	/* As we dropped a packet, better let upper stack know this */
 	/* As we dropped a packet, better let upper stack know this */
 	qdisc_tree_reduce_backlog(sch, 1, dropped);
 	qdisc_tree_reduce_backlog(sch, 1, dropped);