From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
"Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH 4.14 02/21] ibmvnic: fix accelerated VLAN handling
Date: Wed, 21 Nov 2018 20:06:46 +0100 [thread overview]
Message-ID: <20181121183422.199098595@linuxfoundation.org> (raw)
In-Reply-To: <20181121183422.103826775@linuxfoundation.org>
4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
[ 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>
---
drivers/net/ethernet/ibm/ibmvnic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1259,7 +1259,7 @@ static int ibmvnic_xmit(struct sk_buff *
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);
}
next prev parent reply other threads:[~2018-11-22 5:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-21 19:06 [PATCH 4.14 00/21] 4.14.83-stable review Greg Kroah-Hartman
2018-11-21 19:06 ` [PATCH 4.14 01/21] flow_dissector: do not dissect l4 ports for fragments Greg Kroah-Hartman
2018-11-21 19:06 ` Greg Kroah-Hartman [this message]
2018-11-21 19:06 ` [PATCH 4.14 03/21] ip_tunnel: dont force DF when MTU is locked Greg Kroah-Hartman
2018-11-21 19:06 ` [PATCH 4.14 04/21] ipv6: Fix PMTU updates for UDP/raw sockets in presence of VRF Greg Kroah-Hartman
2018-11-21 19:06 ` [PATCH 4.14 05/21] net-gro: reset skb->pkt_type in napi_reuse_skb() Greg Kroah-Hartman
2018-11-21 19:06 ` [PATCH 4.14 06/21] sctp: not allow to set asoc prsctp_enable by sockopt Greg Kroah-Hartman
2018-11-21 19:06 ` [PATCH 4.14 07/21] tg3: Add PHY reset for 5717/5719/5720 in change ring and flow control paths Greg Kroah-Hartman
2018-11-21 19:06 ` [PATCH 4.14 08/21] tuntap: fix multiqueue rx Greg Kroah-Hartman
2018-11-21 19:06 ` [PATCH 4.14 09/21] net: systemport: Protect stop from timeout Greg Kroah-Hartman
2018-11-21 19:06 ` [PATCH 4.14 10/21] net: qualcomm: rmnet: Fix incorrect assignment of real_dev Greg Kroah-Hartman
2018-11-21 19:06 ` [PATCH 4.14 11/21] net: dsa: microchip: initialize mutex before use Greg Kroah-Hartman
2018-11-21 19:06 ` [PATCH 4.14 12/21] sctp: fix strchange_flags name for Stream Change Event Greg Kroah-Hartman
2018-11-21 19:06 ` [PATCH 4.14 13/21] net: phy: mdio-gpio: Fix working over slow can_sleep GPIOs Greg Kroah-Hartman
2018-11-21 19:06 ` [PATCH 4.14 14/21] sctp: not increase streams incnt before sending addstrm_in request Greg Kroah-Hartman
2018-11-21 19:06 ` [PATCH 4.14 15/21] mlxsw: spectrum: Fix IP2ME CPU policer configuration Greg Kroah-Hartman
2018-11-21 19:07 ` [PATCH 4.14 16/21] net: smsc95xx: Fix MTU range Greg Kroah-Hartman
2018-11-21 19:07 ` [PATCH 4.14 17/21] usbnet: smsc95xx: disable carrier check while suspending Greg Kroah-Hartman
2018-11-21 19:07 ` [PATCH 4.14 18/21] inet: frags: better deal with smp races Greg Kroah-Hartman
2018-11-21 19:07 ` [PATCH 4.14 19/21] Revert "x86/speculation: Enable cross-hyperthread spectre v2 STIBP mitigation" Greg Kroah-Hartman
2018-11-21 19:07 ` [PATCH 4.14 20/21] ARM: dts: r8a7791: Correct critical CPU temperature Greg Kroah-Hartman
2018-11-21 19:07 ` [PATCH 4.14 21/21] ARM: dts: r8a7793: " Greg Kroah-Hartman
2018-11-22 5:51 ` [PATCH 4.14 00/21] 4.14.83-stable review kernelci.org bot
2018-11-22 16:35 ` Guenter Roeck
2018-11-23 4:22 ` Naresh Kamboju
2018-11-23 7:14 ` Greg Kroah-Hartman
2018-11-23 9:59 ` Jon Hunter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181121183422.199098595@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mirq-linux@rere.qmqm.pl \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox