All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Toke Høiland-Jørgensen" <toke@redhat.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, cake@lists.bufferbloat.net
Subject: [PATCH net 1/2] sch_cake: Use tc_skb_protocol() helper for getting packet protocol
Date: Thu, 04 Apr 2019 15:01:33 +0200	[thread overview]
Message-ID: <155438289368.18760.9777700364575323470.stgit@alrua-x1> (raw)
In-Reply-To: <155438289359.18760.18027832614176337074.stgit@alrua-x1>

We shouldn't be using skb->protocol directly as that will miss cases with
hardware-accelerated VLAN tags. Use the helper instead to get the right
protocol number.

Reported-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
---
 net/sched/sch_cake.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c
index acc9b9da985f..a3b55e18df04 100644
--- a/net/sched/sch_cake.c
+++ b/net/sched/sch_cake.c
@@ -1519,7 +1519,7 @@ static u8 cake_handle_diffserv(struct sk_buff *skb, u16 wash)
 {
 	u8 dscp;
 
-	switch (skb->protocol) {
+	switch (tc_skb_protocol(skb)) {
 	case htons(ETH_P_IP):
 		dscp = ipv4_get_dsfield(ip_hdr(skb)) >> 2;
 		if (wash && dscp)


  reply	other threads:[~2019-04-04 13:01 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-04 13:01 [PATCH net 0/2] sched: A few small fixes for sch_cake Toke Høiland-Jørgensen
2019-04-04 13:01 ` Toke Høiland-Jørgensen [this message]
2019-04-04 13:01 ` [PATCH net 2/2] sch_cake: Make sure we can write the IP header before changing DSCP bits Toke Høiland-Jørgensen
2019-04-04 19:35   ` Stephen Hemminger
2019-04-04 20:44     ` Toke Høiland-Jørgensen
2019-04-04 21:40       ` Stephen Hemminger
2019-04-04 21:55         ` Toke Høiland-Jørgensen
2019-04-04 17:56 ` [PATCH net 0/2] sched: A few small fixes for sch_cake 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=155438289368.18760.9777700364575323470.stgit@alrua-x1 \
    --to=toke@redhat.com \
    --cc=cake@lists.bufferbloat.net \
    --cc=davem@davemloft.net \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.