From: Thomas Falcon Date: Mon, 12 Mar 2018 16:51:02 +0000 (-0500) Subject: ibmvnic: Account for VLAN tag in L2 Header descriptor X-Git-Tag: v4.17-rc1~148^2~206^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da75e3b6a0292fc926f4773f58c5ff6b8db5a179;p=thirdparty%2Fkernel%2Flinux.git ibmvnic: Account for VLAN tag in L2 Header descriptor If a VLAN tag is present in the Ethernet header, account for that when providing the L2 header to firmware. Signed-off-by: Thomas Falcon Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 7be4b06f69d21..ea9f351eb3438 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1221,7 +1221,10 @@ static int build_hdr_data(u8 hdr_field, struct sk_buff *skb, int len = 0; u8 *hdr; - hdr_len[0] = sizeof(struct ethhdr); + if (skb_vlan_tagged(skb) && !skb_vlan_tag_present(skb)) + hdr_len[0] = sizeof(struct vlan_ethhdr); + else + hdr_len[0] = sizeof(struct ethhdr); if (skb->protocol == htons(ETH_P_IP)) { hdr_len[1] = ip_hdr(skb)->ihl * 4;