Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49053222 authored by Toke Høiland-Jørgensen's avatar Toke Høiland-Jørgensen Committed by Greg Kroah-Hartman
Browse files

sch_cake: Use tc_skb_protocol() helper for getting packet protocol 



[ Upstream commit b2100cc56fca8c51d28aa42a9f1fbcb2cf351996 ]

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: default avatarKevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Signed-off-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5f72cb2a

net/sched/sch_cake.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1526,7 +1526,7 @@ static u8 cake_handle_diffserv(struct sk_buff *skb, u16 wash) 
{

{

	u8 dscp;

	u8 dscp;





	switch (skb->protocol) {

	switch (tc_skb_protocol(skb)) {

	case htons(ETH_P_IP):

	case htons(ETH_P_IP):

		dscp = ipv4_get_dsfield(ip_hdr(skb)) >> 2;

		dscp = ipv4_get_dsfield(ip_hdr(skb)) >> 2;

		if (wash && dscp)

		if (wash && dscp)