Commit e3a53bc5 authored by Marina Varshaver's avatar Marina Varshaver Committed by Saeed Mahameed
Browse files

net/mlx5e: Improve stateless offload capability check 



Use generic function for checking tunnel stateless offload capability
instead of separate macros.

Signed-off-by: default avatarMarina Varshaver <marinav@mellanox.com>
Reviewed-by: default avatarAya Levin <ayal@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent a795d8db

drivers/net/ethernet/mellanox/mlx5/core/en/fs.h

+3 −0
Original line number Diff line number Diff line
@@ -238,5 +238,8 @@ void mlx5e_disable_cvlan_filter(struct mlx5e_priv *priv); 
int mlx5e_create_flow_steering(struct mlx5e_priv *priv);

void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv);



bool mlx5e_tunnel_proto_supported(struct mlx5_core_dev *mdev, u8 proto_type);

bool mlx5e_any_tunnel_proto_supported(struct mlx5_core_dev *mdev);



#endif /* __MLX5E_FLOW_STEER_H__ */

drivers/net/ethernet/mellanox/mlx5/core/en_fs.c

+2 −2
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ static struct mlx5e_etype_proto ttc_tunnel_rules[] = { 


};



static bool mlx5e_tunnel_proto_supported(struct mlx5_core_dev *mdev, u8 proto_type)

bool mlx5e_tunnel_proto_supported(struct mlx5_core_dev *mdev, u8 proto_type)

{

	switch (proto_type) {

	case IPPROTO_GRE:
@@ -779,7 +779,7 @@ static bool mlx5e_tunnel_proto_supported(struct mlx5_core_dev *mdev, u8 proto_ty 
	}

}



static bool mlx5e_any_tunnel_proto_supported(struct mlx5_core_dev *mdev)

bool mlx5e_any_tunnel_proto_supported(struct mlx5_core_dev *mdev)

{

	int tt;

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+2 −2
Original line number Diff line number Diff line
@@ -4879,7 +4879,7 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 
	netdev->hw_features      |= NETIF_F_HW_VLAN_STAG_TX;



	if (mlx5_vxlan_allowed(mdev->vxlan) || mlx5_geneve_tx_allowed(mdev) ||

	    MLX5_CAP_ETH(mdev, tunnel_stateless_gre)) {

	    mlx5e_any_tunnel_proto_supported(mdev)) {

		netdev->hw_enc_features |= NETIF_F_HW_CSUM;

		netdev->hw_enc_features |= NETIF_F_TSO;

		netdev->hw_enc_features |= NETIF_F_TSO6;
@@ -4894,7 +4894,7 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 
		netdev->gso_partial_features = NETIF_F_GSO_UDP_TUNNEL_CSUM;

	}



	if (MLX5_CAP_ETH(mdev, tunnel_stateless_gre)) {

	if (mlx5e_tunnel_proto_supported(mdev, IPPROTO_GRE)) {

		netdev->hw_features     |= NETIF_F_GSO_GRE |

					   NETIF_F_GSO_GRE_CSUM;

		netdev->hw_enc_features |= NETIF_F_GSO_GRE |

CRA Git | Maintained and supported by SUSTech CRA and CCSE