From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44202C06510 for ; Tue, 2 Jul 2019 08:15:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13AEC20645 for ; Tue, 2 Jul 2019 08:15:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562055325; bh=aeMgeXVWW7+InDxJJGPHN3znFKO8Mt06IlVOm7qBbQU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TFiZBoPmDJlrgdLWeuTRQlbwcq5wNgCEyXBpNLLa7STNJJeSfnz9FkyY49SIIqU26 vXWiYj6hP5OzQcwCtb0hzko/s+ZCtqELPNfb7hYUeFa800L0Nnyq9xC5PiTMMHdcW1 0j0eP4OgbGE9mxZQLntJeDrA8qJ0MVPy6TF1V/Qk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727360AbfGBIE6 (ORCPT ); Tue, 2 Jul 2019 04:04:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:50740 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727142AbfGBIE5 (ORCPT ); Tue, 2 Jul 2019 04:04:57 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CB4562184B; Tue, 2 Jul 2019 08:04:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562054697; bh=aeMgeXVWW7+InDxJJGPHN3znFKO8Mt06IlVOm7qBbQU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QPdYajHWAwAne2RX3X8pAr8gXo+2yZsFrHdYHTsXPhiL4rfxvw3YuozeHyEEtK9tl /JxDZ+FW9q4e31+UsP7P4lNmGtmwzr8M+QzdXr5frf1qb0VvGH0m1Z0avoPHDnIPjF 4HnxqUpzCMNPVLLeALcCb/55HPzhOyXPWXyKq2pE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Pirko , YueHaibing , "David S. Miller" Subject: [PATCH 5.1 39/55] team: Always enable vlan tx offload Date: Tue, 2 Jul 2019 10:01:47 +0200 Message-Id: <20190702080126.153070784@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190702080124.103022729@linuxfoundation.org> References: <20190702080124.103022729@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: YueHaibing [ Upstream commit ee4297420d56a0033a8593e80b33fcc93fda8509 ] We should rather have vlan_tci filled all the way down to the transmitting netdevice and let it do the hw/sw vlan implementation. Suggested-by: Jiri Pirko Signed-off-by: YueHaibing Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/team/team.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -2135,12 +2135,12 @@ static void team_setup(struct net_device dev->features |= NETIF_F_NETNS_LOCAL; dev->hw_features = TEAM_VLAN_FEATURES | - NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_FILTER; dev->hw_features |= NETIF_F_GSO_ENCAP_ALL | NETIF_F_GSO_UDP_L4; dev->features |= dev->hw_features; + dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX; } static int team_newlink(struct net *src_net, struct net_device *dev,