diff options
| author |   Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2018-11-07 17:50:52 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-11-07 22:36:21 -0800 |
| commit | e84b47941e15e6666afb8ee8b21d1c3fc1a013af (patch) | |
| tree | 2a3cbc83277218138ffcbc5b1c5b577e44c625cc /drivers/net/ethernet/ibm | |
| parent | Merge branch 'FDDI-defza-Fix-a-bunch-of-small-issues' (diff) | |
| download | linux-dev-e84b47941e15e6666afb8ee8b21d1c3fc1a013af.tar.xz linux-dev-e84b47941e15e6666afb8ee8b21d1c3fc1a013af.zip | |
ibmvnic: fix accelerated VLAN handling
Don't request tag insertion when it isn't present in outgoing skb.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 7893beffcc71..c9d5d0a7fbf1 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1545,7 +1545,7 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) tx_crq.v1.sge_len = cpu_to_be32(skb->len); tx_crq.v1.ioba = cpu_to_be64(data_dma_addr); - if (adapter->vlan_header_insertion) { + if (adapter->vlan_header_insertion && skb_vlan_tag_present(skb)) { tx_crq.v1.flags2 |= IBMVNIC_TX_VLAN_INSERT; tx_crq.v1.vlan_id = cpu_to_be16(skb->vlan_tci); } |