* [PATCH net] ibmvnic: fix accelerated VLAN handling
@ 2018-11-07 16:50 Michał Mirosław
2018-11-08 6:37 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Michał Mirosław @ 2018-11-07 16:50 UTC (permalink / raw)
To: netdev; +Cc: Thomas Falcon, John Allen
Don't request tag insertion when it isn't present in outgoing skb.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/ethernet/ibm/ibmvnic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
}
--
2.19.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] ibmvnic: fix accelerated VLAN handling
2018-11-07 16:50 [PATCH net] ibmvnic: fix accelerated VLAN handling Michał Mirosław
@ 2018-11-08 6:37 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2018-11-08 6:37 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, tlfalcon, jallen
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Wed, 07 Nov 2018 17:50:52 +0100
> Don't request tag insertion when it isn't present in outgoing skb.
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-08 16:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-07 16:50 [PATCH net] ibmvnic: fix accelerated VLAN handling Michał Mirosław
2018-11-08 6:37 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).