From patchwork Wed Nov 7 16:50:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 994372 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rere.qmqm.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="aN33nU7V"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42qt384QDXz9sCX for ; Thu, 8 Nov 2018 04:00:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728014AbeKHCcD (ORCPT ); Wed, 7 Nov 2018 21:32:03 -0500 Received: from rere.qmqm.pl ([91.227.64.183]:21324 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727576AbeKHCcD (ORCPT ); Wed, 7 Nov 2018 21:32:03 -0500 X-Greylist: delayed 597 seconds by postgrey-1.27 at vger.kernel.org; Wed, 07 Nov 2018 21:32:02 EST Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 42qspX0lqNz2t; Wed, 7 Nov 2018 17:49:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1541609396; bh=uv+qJlD527YGJSVOIbbsCURdzw2hPfrQtUxHSVUJyKI=; h=Date:From:Subject:To:Cc:From; b=aN33nU7VjSdLEMELeI5WNSNUjq/dvP4Xq8E5WIxZp5XDx+UgWzRqMABi/iM75AKlU xftCuFdvkFk/0p7LRCClWOn4OdZ8DLvNcMVPywxPntiOxojhxmeZ0sUh2X47xvJCLe 7q/lEOuNfoPZLcvkw0yvGvu70o8p4Rv9740qCQ03s9aOOz6CS6ABLs0rUuZV3KH+Fq NCAur5AiGzVcbCr/ohWxic3WwwJDTQkqIMLyTor8Mkdmt82NMQeqNKzCGOd3XJcBcS un3P9+zC2K9hGwsBsDhyGxBUYiWoIWTNc2gZs2CWwtTUroFQYZ7Q/OWMF/D38QE8Ph SA9j6TAyCdnew== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.100.2 at mail Date: Wed, 07 Nov 2018 17:50:52 +0100 Message-Id: <3cad1feb702479b9db69b3cdb393e9b331fe4ce7.1541609304.git.mirq-linux@rere.qmqm.pl> From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH net] ibmvnic: fix accelerated VLAN handling MIME-Version: 1.0 To: netdev@vger.kernel.org Cc: Thomas Falcon , John Allen Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Don't request tag insertion when it isn't present in outgoing skb. Signed-off-by: Michał Mirosław --- 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); }