Hi,
This patch is as same as the previous one.
I just cleaned up some code.
Thanks,
Hirokazu Takahashi.
Signed-off-by: Hirokazu Takahashi <[EMAIL PROTECTED]>
--- linux-2.6.21/net/sched/sch_tbf.c.ORG 2007-05-08 20:59:28.000000000
+0900
+++ linux-2.6.21/net/sched/sch_tbf.c 2007-05-21 21:05:18.000000000 +0900
@@ -9,7 +9,8 @@
* Authors: Alexey Kuznetsov, <[EMAIL PROTECTED]>
* Dmitry Torokhov <[EMAIL PROTECTED]> - allow attaching inner
qdiscs -
* original idea by Martin Devera
- *
+ * Fixes:
+ * Hirokazu Takahashi <[EMAIL PROTECTED]> : TSO support
*/
#include <linux/module.h>
@@ -138,8 +139,11 @@ static int tbf_enqueue(struct sk_buff *s
{
struct tbf_sched_data *q = qdisc_priv(sch);
int ret;
+ unsigned int segs = skb_is_gso(skb) ? skb_shinfo(skb)->gso_segs ? :
+ skb->len/skb_shinfo(skb)->gso_size + 1 : 1;
+ unsigned int len = (skb->len - 1)/segs + 1;
- if (skb->len > q->max_size) {
+ if (len > q->max_size) {
sch->qstats.drops++;
#ifdef CONFIG_NET_CLS_POLICE
if (sch->reshape_fail == NULL || sch->reshape_fail(skb, sch))
@@ -204,22 +208,40 @@ static struct sk_buff *tbf_dequeue(struc
psched_time_t now;
long toks, delay;
long ptoks = 0;
- unsigned int len = skb->len;
+ /*
+ * Note: TSO packets will be larger than its actual mtu.
+ * These packets should be treated as packets including
+ * several ordinary ones. In this case, tokens should
+ * be held until it reaches the length of them.
+ *
+ * To simplify, we assume each segment in a TSO packet
+ * has the same length though it may probably not be true.
+ * And ignore the length of headers which will be applied
+ * to each segment when splitting TSO packets.
+ *
+ * The number of segments are calculated from the segment
+ * size of TSO packets temporarily if it isn't set.
+ */
+ unsigned int segs = skb_shinfo(skb)->gso_segs ? :
+ skb_is_gso(skb) ? skb->len/skb_shinfo(skb)->gso_size + 1 : 1;
+ unsigned int len = (skb->len - 1)/segs + 1;
+ unsigned int expect = L2T(q, len) * segs;
+ long max_toks = max(expect, q->buffer);
PSCHED_GET_TIME(now);
- toks = PSCHED_TDIFF_SAFE(now, q->t_c, q->buffer);
+ toks = PSCHED_TDIFF_SAFE(now, q->t_c, max_toks);
if (q->P_tab) {
ptoks = toks + q->ptokens;
- if (ptoks > (long)q->mtu)
- ptoks = q->mtu;
- ptoks -= L2T_P(q, len);
+ if (ptoks > (long)(q->mtu * segs))
+ ptoks = q->mtu * segs;
+ ptoks -= L2T_P(q, len) * segs;
}
toks += q->tokens;
- if (toks > (long)q->buffer)
- toks = q->buffer;
- toks -= L2T(q, len);
+ if (toks > max_toks)
+ toks = max_toks;
+ toks -= expect;
if ((toks|ptoks) >= 0) {
q->t_c = now;
-
To unsubscribe from this list: send the line "unsubscribe linux-net" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
