Commit d6e97657 authored Nov 07, 2018 by Michał Mirosław Committed by Greg Kroah-Hartman Nov 23, 2018

ibmvnic: fix accelerated VLAN handling



[ Upstream commit e84b47941e15e6666afb8ee8b21d1c3fc1a013af ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent ceb85d87

drivers/net/ethernet/ibm/ibmvnic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1259,7 +1259,7 @@ static int 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);
		}