* [PATCH 2.6.11.7] sch_htb: Drop packet when direct queue is full
2005-04-21 21:54 ` Thomas Graf
@ 2005-04-21 23:02 ` Asim Shankar
0 siblings, 0 replies; 4+ messages in thread
From: Asim Shankar @ 2005-04-21 23:02 UTC (permalink / raw)
To: netdev; +Cc: devik, Thomas Graf
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>
--- linux-2.6.11.7/net/sched/sch_htb.c.orig 2005-04-21 17:40:05.305709014 -0500
+++ linux-2.6.11.7/net/sched/sch_htb.c 2005-04-21 17:35:27.872624173 -0500
@@ -717,6 +717,10 @@ static int htb_enqueue(struct sk_buff *s
if (q->direct_queue.qlen < q->direct_qlen) {
__skb_queue_tail(&q->direct_queue, skb);
q->direct_pkts++;
+ } else {
+ kfree_skb(skb);
+ sch->qstats.drops++;
+ return NET_XMIT_DROP;
}
#ifdef CONFIG_NET_CLS_ACT
} else if (!cl) {
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2.6.11.7] sch_htb: Drop packet when direct queue is full
@ 2005-04-25 19:15 Asim Shankar
2005-04-28 19:04 ` David S. Miller
0 siblings, 1 reply; 4+ messages in thread
From: Asim Shankar @ 2005-04-25 19:15 UTC (permalink / raw)
To: netdev; +Cc: davem
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 patch:
Erroneously returned NET_XMIT_SUCCESS even though packet was not enqueued)
Signed-off-by: Asim Shankar <asimshankar@gmail.com>
--- linux-2.6.11.7/net/sched/sch_htb.c.orig 2005-04-21 17:40:05.305709014 -0500
+++ linux-2.6.11.7/net/sched/sch_htb.c 2005-04-21 17:35:27.872624173 -0500
@@ -717,6 +717,10 @@ static int htb_enqueue(struct sk_buff *s
if (q->direct_queue.qlen < q->direct_qlen) {
__skb_queue_tail(&q->direct_queue, skb);
q->direct_pkts++;
+ } else {
+ kfree_skb(skb);
+ sch->qstats.drops++;
+ return NET_XMIT_DROP;
}
#ifdef CONFIG_NET_CLS_ACT
} else if (!cl) {
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2.6.11.7] sch_htb: Drop packet when direct queue is full
2005-04-25 19:15 [PATCH 2.6.11.7] sch_htb: Drop packet when direct queue is full Asim Shankar
@ 2005-04-28 19:04 ` David S. Miller
2005-04-29 17:35 ` Asim Shankar
0 siblings, 1 reply; 4+ messages in thread
From: David S. Miller @ 2005-04-28 19:04 UTC (permalink / raw)
To: Asim Shankar; +Cc: netdev
On Mon, 25 Apr 2005 14:15:05 -0500 (CDT)
Asim Shankar <asimshankar@gmail.com> wrote:
> 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 patch:
> Erroneously returned NET_XMIT_SUCCESS even though packet was not enqueued)
>
> Signed-off-by: Asim Shankar <asimshankar@gmail.com>
Your patch is mangled by your email client. The non-changing lines
in the patch have two leading spaces, which is wrong. So the patch
will not apply.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2.6.11.7] sch_htb: Drop packet when direct queue is full
2005-04-28 19:04 ` David S. Miller
@ 2005-04-29 17:35 ` Asim Shankar
0 siblings, 0 replies; 4+ messages in thread
From: Asim Shankar @ 2005-04-29 17:35 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev
> Your patch is mangled by your email client. The non-changing lines
> in the patch have two leading spaces, which is wrong. So the patch
> will not apply.
>
Resending as a gzipped attachment. Hope this works.
Thanks,
-- Asim
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2005-04-29 17:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-04-25 19:15 [PATCH 2.6.11.7] sch_htb: Drop packet when direct queue is full Asim Shankar
2005-04-28 19:04 ` David S. Miller
2005-04-29 17:35 ` Asim Shankar
-- strict thread matches above, loose matches on Subject: below --
2005-04-21 19:21 BUG: HTB? Asim Shankar
2005-04-21 19:56 ` Thomas Graf
2005-04-21 20:41 ` [PATCH] - sch_htb: Drop packet when direct queue overflows Asim Shankar
2005-04-21 21:54 ` Thomas Graf
2005-04-21 23:02 ` [PATCH 2.6.11.7] sch_htb: Drop packet when direct queue is full Asim Shankar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).