From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DDC2414A4E7; Tue, 17 Dec 2024 17:17:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734455871; cv=none; b=X/mHwx1G8Fc0tsl0rJQhC7IbXyO4ep6YiOivwSn71F6BTkGgD/tGdNmEaBhyZ4k+IngEVq+pglx9MJDLUM5LshldczsjHfsGLRVLkhVz9NgwuetzX71Ev4c0erPFhax1gKnogZvPs29UlTxHV9PtgVzIlifver70V25/O3JYRzk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734455871; c=relaxed/simple; bh=O88EggJsQXQslsE0uG0dEpFp2pfwIOZDe2GY6JzKXWs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fARZh1KFhYqS37R2Jhx3DtS9RExZkshJSBqruMVDq6ZzfDI30/K3laTVk/+KtREELxMu6UP75QjrtVZFlQyUQSJkxIs3ssBX3GRu19HHrVSMXALs7q2HzlgSnlWWKiCXOk5iiI+6c7JkVyTYJD7NS/GAfmJI2du+IkfWMChSgf4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AoQYMi1W; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="AoQYMi1W" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6507DC4CED3; Tue, 17 Dec 2024 17:17:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734455870; bh=O88EggJsQXQslsE0uG0dEpFp2pfwIOZDe2GY6JzKXWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AoQYMi1WQSAdTcaWq9HsOwi7WHeShqZYK5Q//a7F43VispOxZa27D+i406b8/n/T1 Yqdxwv/yk2LjN5ilCLEQr37IRxInFNAdsvLGDo2dVVPTRGF8Wn+4Cml9El8gIJ4gc3 fKQJ3iSAMc17qzQGHYe4II/ds2+DGkHOg8514YF8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Daniel Borkmann , Nikolay Aleksandrov , Ido Schimmel , Jiri Pirko , Hangbin Liu , Paolo Abeni , Sasha Levin Subject: [PATCH 6.1 61/76] team: Fix feature propagation of NETIF_F_GSO_ENCAP_ALL Date: Tue, 17 Dec 2024 18:07:41 +0100 Message-ID: <20241217170528.802771704@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241217170526.232803729@linuxfoundation.org> References: <20241217170526.232803729@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Borkmann [ Upstream commit 98712844589e06d9aa305b5077169942139fd75c ] Similar to bonding driver, add NETIF_F_GSO_ENCAP_ALL to TEAM_VLAN_FEATURES in order to support slave devices which propagate NETIF_F_GSO_UDP_TUNNEL & NETIF_F_GSO_UDP_TUNNEL_CSUM as vlan_features. Fixes: 3625920b62c3 ("teaming: fix vlan_features computing") Signed-off-by: Daniel Borkmann Cc: Nikolay Aleksandrov Cc: Ido Schimmel Cc: Jiri Pirko Reviewed-by: Nikolay Aleksandrov Reviewed-by: Hangbin Liu Link: https://patch.msgid.link/20241210141245.327886-5-daniel@iogearbox.net Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/team/team.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 293eaf6b3ec9..872640a9e73a 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -984,7 +984,8 @@ static void team_port_disable(struct team *team, #define TEAM_VLAN_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG | \ NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE | \ - NETIF_F_HIGHDMA | NETIF_F_LRO) + NETIF_F_HIGHDMA | NETIF_F_LRO | \ + NETIF_F_GSO_ENCAP_ALL) #define TEAM_ENC_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG | \ NETIF_F_RXCSUM | NETIF_F_GSO_SOFTWARE) -- 2.39.5