ibmvnic: fix accelerated VLAN handling

osctobe · davem330 · commit e84b47941e15 · 2018-11-07T22:36:21.000-08:00
Don't request tag insertion when it isn't present in outgoing skb.

Signed-off-by: Michał Mirosław &lt;mirq-linux@rere.qmqm.pl&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1545,7 +1545,7 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff skb, struct net_device netdev)`
`1545`	`1545`	`tx_crq.v1.sge_len = cpu_to_be32(skb->len);`
`1546`	`1546`	`tx_crq.v1.ioba = cpu_to_be64(data_dma_addr);`
`1547`	`1547`
`1548`		`- if (adapter->vlan_header_insertion) {`
	`1548`	`+ if (adapter->vlan_header_insertion && skb_vlan_tag_present(skb)) {`
`1549`	`1549`	`tx_crq.v1.flags2 \|= IBMVNIC_TX_VLAN_INSERT;`
`1550`	`1550`	`tx_crq.v1.vlan_id = cpu_to_be16(skb->vlan_tci);`
`1551`	`1551`	`}`