瀏覽代碼

[PKT_SCHED]: HTB: Drop packet when direct queue is full

htb_enqueue(): Free skb and return NET_XMIT_DROP if a packet is
destined for the direct_queue but the direct_queue is full. (Before
this: erroneously returned NET_XMIT_SUCCESS even though the packet was
not enqueued)

Signed-off-by: Asim Shankar <asimshankar@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Asim Shankar 20 年之前
父節點
當前提交
033d899904
共有 1 個文件被更改,包括 4 次插入0 次删除
  1. 4 0
      net/sched/sch_htb.c

+ 4 - 0
net/sched/sch_htb.c

@@ -717,6 +717,10 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 	if (q->direct_queue.qlen < q->direct_qlen) {
 	if (q->direct_queue.qlen < q->direct_qlen) {
 	    __skb_queue_tail(&q->direct_queue, skb);
 	    __skb_queue_tail(&q->direct_queue, skb);
 	    q->direct_pkts++;
 	    q->direct_pkts++;
+	} else {
+	    kfree_skb(skb);
+	    sch->qstats.drops++;
+	    return NET_XMIT_DROP;
 	}
 	}
 #ifdef CONFIG_NET_CLS_ACT
 #ifdef CONFIG_NET_CLS_ACT
     } else if (!cl) {
     } else if (!cl) {