Commit 324cefaf authored by Menglong Dong's avatar Menglong Dong Committed by Jakub Kicinski
Browse files

net: core: use eth_type_vlan in __netif_receive_skb_core 



Replace the check for ETH_P_8021Q and ETH_P_8021AD in
__netif_receive_skb_core with eth_type_vlan.

Signed-off-by: default avatarMenglong Dong <dong.menglong@zte.com.cn>
Link: https://lore.kernel.org/r/20210111104221.3451-1-dong.menglong@zte.com.cn


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 679500e3

net/core/dev.c

+2 −4
Original line number Diff line number Diff line
@@ -5151,8 +5151,7 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc, 
		skb_reset_mac_len(skb);

	}



	if (skb->protocol == cpu_to_be16(ETH_P_8021Q) ||

	    skb->protocol == cpu_to_be16(ETH_P_8021AD)) {

	if (eth_type_vlan(skb->protocol)) {

		skb = skb_vlan_untag(skb);

		if (unlikely(!skb))

			goto out;
@@ -5236,8 +5235,7 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc, 
			 * find vlan device.

			 */

			skb->pkt_type = PACKET_OTHERHOST;

		} else if (skb->protocol == cpu_to_be16(ETH_P_8021Q) ||

			   skb->protocol == cpu_to_be16(ETH_P_8021AD)) {

		} else if (eth_type_vlan(skb->protocol)) {

			/* Outer header is 802.1P with vlan 0, inner header is

			 * 802.1Q or 802.1AD and vlan_do_receive() above could

			 * not find vlan dev for vlan id 0.