|
@@ -4567,8 +4567,7 @@ int skb_vlan_pop(struct sk_buff *skb)
|
|
|
if (likely(skb_vlan_tag_present(skb))) {
|
|
|
skb->vlan_tci = 0;
|
|
|
} else {
|
|
|
- if (unlikely(skb->protocol != htons(ETH_P_8021Q) &&
|
|
|
- skb->protocol != htons(ETH_P_8021AD)))
|
|
|
+ if (unlikely(!eth_type_vlan(skb->protocol)))
|
|
|
return 0;
|
|
|
|
|
|
err = __skb_vlan_pop(skb, &vlan_tci);
|
|
@@ -4576,8 +4575,7 @@ int skb_vlan_pop(struct sk_buff *skb)
|
|
|
return err;
|
|
|
}
|
|
|
/* move next vlan tag to hw accel tag */
|
|
|
- if (likely(skb->protocol != htons(ETH_P_8021Q) &&
|
|
|
- skb->protocol != htons(ETH_P_8021AD)))
|
|
|
+ if (likely(!eth_type_vlan(skb->protocol)))
|
|
|
return 0;
|
|
|
|
|
|
vlan_proto = skb->protocol;
|