sch_cake: Use tc_skb_protocol() helper for getting packet protocol

tohojo · davem330 · commit b2100cc56fca · 2019-04-04T10:55:59.000-07:00
We shouldn't be using skb-&gt;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 &lt;kevin@darbyshire-bryant.me.uk&gt;
Signed-off-by: Toke Høiland-Jørgensen &lt;toke@redhat.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -1519,7 +1519,7 @@ static u8 cake_handle_diffserv(struct sk_buff *skb, u16 wash)`
`1519`	`1519`	`{`
`1520`	`1520`	`u8 dscp;`
`1521`	`1521`
`1522`		`- switch (skb->protocol) {`
	`1522`	`+ switch (tc_skb_protocol(skb)) {`
`1523`	`1523`	`case htons(ETH_P_IP):`
`1524`	`1524`	`dscp = ipv4_get_dsfield(ip_hdr(skb)) >> 2;`
`1525`	`1525`	`if (wash && dscp)`