From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id A5E7C3B29E for ; Fri, 5 Apr 2019 06:28:24 -0400 (EDT) Received: by mail-ed1-f67.google.com with SMTP id s39so5054954edb.2 for ; Fri, 05 Apr 2019 03:28:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=S0aLG5xy+ljxKLnYbag5fA4yjy+cet2QTyVgX6eIbV0=; b=hLn6B1mXlhjUnZu6Xg3A266tkQbzLFm4m2dobuuojjSYty4Of6xhJQXYhaxkOceDdm WgrE9/u1qKUf/EF7urp9SPeIScn2dm37MQE02jNdI0K6A629R3lJg4CWyUos/l2V5bgk BUwGNGOe0X7+yVB0UlISNcl9idt527cKYS1wUIzeS7ANZL8JWQyyRCBkF3SeQn+u+FuA eHme2wrkU6p0gQzEClR7jJwtzxoMPZ7MJsrf0Zp9cy5o9i13BW4jeGjalJ1i0Mwyr6us ZDWLj7vmBDlrQ5PZOSNHsdogEbvJBa2nV1dWa2Bs/T7YSJ7DLZjWpP1G2c/tw2GZHn+S jyTQ== X-Gm-Message-State: APjAAAUk13+Kf4IeWUtQYxya4k3bxZMtuWw0w0Sf0Ce5oO2HcSngbFHA NGmmkf+NfG0fl+5a2mvso3cT0Q== X-Google-Smtp-Source: APXvYqwEGeyS8vdyhhLl0F0MiknmB+kB2PoBCe2J+6p8eZ2hpM00QqqluNQOqmQ1r1Gr2bxZEm1oXA== X-Received: by 2002:a17:906:27da:: with SMTP id k26mr6644137ejc.175.1554460103829; Fri, 05 Apr 2019 03:28:23 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk (borgediget.toke.dk. [85.204.121.218]) by smtp.gmail.com with ESMTPSA id y5sm189900eds.7.2019.04.05.03.28.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Apr 2019 03:28:22 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 17F081804A7; Fri, 5 Apr 2019 12:28:22 +0200 (CEST) From: Toke =?utf-8?q?H=C3=B8iland-J=C3=B8rgensen?= To: Greg Kroah-Hartman Cc: David Miller , stable@vger.kernel.org, cake@lists.bufferbloat.net Date: Fri, 05 Apr 2019 12:28:22 +0200 Message-ID: <155446010204.1460.9767080514106105716.stgit@alrua-x1> In-Reply-To: <155446010188.1460.16734711102827171744.stgit@alrua-x1> References: <155446010188.1460.16734711102827171744.stgit@alrua-x1> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: [Cake] [PATCH for-4.19 2/3] sch_cake: Use tc_skb_protocol() helper for getting packet protocol X-BeenThere: cake@lists.bufferbloat.net X-Mailman-Version: 2.1.20 Precedence: list List-Id: Cake - FQ_codel the next generation List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Apr 2019 10:28:24 -0000 Commit bbd669a868bba591ffd38b7bc75a7b361bb54b04 upstream. 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 Signed-off-by: Toke Høiland-Jørgensen --- 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 640f00e9f665..de92b5d81ca6 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -1512,7 +1512,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)