Skip to content

Commit c6c217c

Browse files
borkmanngregkh
authored andcommitted
team: Fix feature propagation of NETIF_F_GSO_ENCAP_ALL
[ Upstream commit 9871284 ] 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: 3625920 ("teaming: fix vlan_features computing") Signed-off-by: Daniel Borkmann <[email protected]> Cc: Nikolay Aleksandrov <[email protected]> Cc: Ido Schimmel <[email protected]> Cc: Jiri Pirko <[email protected]> Reviewed-by: Nikolay Aleksandrov <[email protected]> Reviewed-by: Hangbin Liu <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 679b588 commit c6c217c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/net/team/team.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,8 @@ static void team_port_disable(struct team *team,
982982

983983
#define TEAM_VLAN_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG | \
984984
NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE | \
985-
NETIF_F_HIGHDMA | NETIF_F_LRO)
985+
NETIF_F_HIGHDMA | NETIF_F_LRO | \
986+
NETIF_F_GSO_ENCAP_ALL)
986987

987988
#define TEAM_ENC_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG | \
988989
NETIF_F_RXCSUM | NETIF_F_GSO_SOFTWARE)

0 commit comments

Comments
 (0)