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.8 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,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 22162C3A5A1 for ; Thu, 22 Aug 2019 17:30:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB2E2233FC for ; Thu, 22 Aug 2019 17:30:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566495008; bh=vCztjgEQxsmYwa/YTzqxEvYoG1fSpMAABOtZwBChPIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mA9twVMARrHqBmhrl+KGtjRXE9L95JUD7Rd3uMTIN8oVgsyg3ENXwuUsY0WeQw659 1elWpmxrBDb1tbZhT0PO4X047B87UuSnhpsPw+RqyTBSfbGbeqqHzEJFKEmBbzuP4E 2fbf/HnNCD5Pzz9dHMmES+HU49M7MuYSddyur1s0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392095AbfHVRaC (ORCPT ); Thu, 22 Aug 2019 13:30:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:51544 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404677AbfHVR0Q (ORCPT ); Thu, 22 Aug 2019 13:26:16 -0400 Received: from localhost (wsip-184-188-36-2.sd.sd.cox.net [184.188.36.2]) (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 6479C23400; Thu, 22 Aug 2019 17:26:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566494775; bh=vCztjgEQxsmYwa/YTzqxEvYoG1fSpMAABOtZwBChPIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bPMEtCNivGD/e7yE7tNFA3kQFfA2XMlxXVmIZtI2IltDS9El3J6p9ltj+TvwvWeV+ 2JNaCsrmZA153h4yzjgrFYHkalYhG0TN8ylQuuCtDw9+8zbzURBH4L889AhC+Abjbn AsJvfcTGtgrvus1Fr7kLh4RDm+ufkzcTn8g90AsU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YueHaibing , "David S. Miller" Subject: [PATCH 4.19 80/85] team: Add vlan tx offload to hw_enc_features Date: Thu, 22 Aug 2019 10:19:53 -0700 Message-Id: <20190822171734.548265457@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190822171731.012687054@linuxfoundation.org> References: <20190822171731.012687054@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: YueHaibing [ Upstream commit 227f2f030e28d8783c3d10ce70ff4ba79cad653f ] We should also enable team's vlan tx offload in hw_enc_features, pass the vlan packets to the slave devices with vlan tci, let the slave handle vlan tunneling offload implementation. Fixes: 3268e5cb494d ("team: Advertise tunneling offload features") 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, 2 insertions(+) --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1011,6 +1011,8 @@ static void __team_compute_features(stru team->dev->vlan_features = vlan_features; team->dev->hw_enc_features = enc_features | NETIF_F_GSO_ENCAP_ALL | + NETIF_F_HW_VLAN_CTAG_TX | + NETIF_F_HW_VLAN_STAG_TX | NETIF_F_GSO_UDP_L4; team->dev->hard_header_len = max_hard_header_len;