netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: eric.dumazet@gmail.com
Cc: chromatix99@gmail.com, d@taht.net, netdev@vger.kernel.org
Subject: Re: [Bloat] shaper team forming up
Date: Tue, 15 Mar 2011 15:51:51 -0700 (PDT)	[thread overview]
Message-ID: <20110315.155151.226785359.davem@davemloft.net> (raw)
In-Reply-To: <1300164166.2649.70.camel@edumazet-laptop>

From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 15 Mar 2011 05:42:46 +0100

> Le lundi 14 mars 2011 à 21:24 +0100, Eric Dumazet a écrit :
> 
> David, it seems ip_tos2prio is wrong on its 2nd entry :

Indeed, and in context, this is simply a thinko which has survived since
ECN support first got added to the tree, here's the relevant hunk:

--------------------
@@ -152,23 +152,29 @@ struct dst_ops ipv4_dst_ops =
 	sizeof(struct rtable),
 };
 
+#ifdef CONFIG_INET_ECN
+#define ECN_OR_COST(class)	TC_PRIO_##class
+#else
+#define ECN_OR_COST(class)	TC_PRIO_FILLER
+#endif
+
 __u8 ip_tos2prio[16] = {
 	TC_PRIO_BESTEFFORT,
-	TC_PRIO_FILLER,
+	ECN_OR_COST(FILLER),
 	TC_PRIO_BESTEFFORT,
-	TC_PRIO_FILLER,
+	ECN_OR_COST(BESTEFFORT),
 	TC_PRIO_BULK,
-	TC_PRIO_FILLER,
+	ECN_OR_COST(BULK),
 	TC_PRIO_BULK,
-	TC_PRIO_FILLER,
+	ECN_OR_COST(BULK),
 	TC_PRIO_INTERACTIVE,
-	TC_PRIO_FILLER,
+	ECN_OR_COST(INTERACTIVE),
 	TC_PRIO_INTERACTIVE,
-	TC_PRIO_FILLER,
+	ECN_OR_COST(INTERACTIVE),
 	TC_PRIO_INTERACTIVE_BULK,
-	TC_PRIO_FILLER,
+	ECN_OR_COST(INTERACTIVE_BULK),
 	TC_PRIO_INTERACTIVE_BULK,
-	TC_PRIO_FILLER
+	ECN_OR_COST(INTERACTIVE_BULK)
 };

  parent reply	other threads:[~2011-03-15 22:51 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <87wrk1a4gx.fsf@cruithne.co.teklibre.org>
     [not found] ` <5BC42741-852B-4699-BA5D-D70B8D610D96@gmail.com>
2011-03-14 20:24   ` [Bloat] shaper team forming up Eric Dumazet
2011-03-15  4:42     ` Eric Dumazet
2011-03-15  5:27       ` ECN + pfifo_fast borked? (Was Re: [Bloat] shaper team forming up) Dave Täht
2011-03-15  6:15         ` Eric Dumazet
2011-03-15 17:09           ` Jonathan Morton
2011-03-15 18:28             ` Eric Dumazet
2011-03-15 18:37               ` Jonathan Morton
2011-03-15 19:56                 ` Eric Dumazet
2011-03-15 22:51       ` David Miller [this message]
2011-03-15 22:53       ` [Bloat] shaper team forming up David Miller
2011-03-15 23:00         ` Eric Dumazet
2011-03-15 23:56         ` [PATCH] net_sched: fix ip_tos2prio Eric Dumazet
2011-03-16  1:54           ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110315.155151.226785359.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=chromatix99@gmail.com \
    --cc=d@taht.net \
    --cc=eric.dumazet@gmail.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).