diff options
| author |   Thomas Falcon <tlfalcon@linux.vnet.ibm.com> | 2018-03-12 11:51:02 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-13 10:09:27 -0400 |
| commit | da75e3b6a0292fc926f4773f58c5ff6b8db5a179 (patch) | |
| tree | 45dcafaae61c3a48482897cdae3322f6c6e50d3b /drivers/net/ethernet/ibm/ibmvnic.c | |
| parent | tc-testing: updated gact tests with batch test cases (diff) | |
| download | linux-dev-da75e3b6a0292fc926f4773f58c5ff6b8db5a179.tar.xz linux-dev-da75e3b6a0292fc926f4773f58c5ff6b8db5a179.zip | |
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 <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 7be4b06f69d2..ea9f351eb343 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; |