net/mlx5e: SHAMPO, Remove dead CWR handling in GRO header update
Subsystems (5)
Tariq Toukan
maintainerPATCH 1/1 net/mlx5e: SHAMPO, Remove dead CWR handling in GRO header update
From: Dragos Tatulea <[email protected]>
mlx5e_shampo_update_ipv{4,6}_tcp_hdr() runs only from the gro_count > 1 path in mlx5e_shampo_flush_skb(). HW-GRO flushes the current session on a CWR packet and delivers it as a single-segment skb via napi_gro_receive(), so the aggregated (gro_count > 1) skb never carries a CWR-set TCP header.
This patch drops the unreachable branch. Discussion context:
https://lore.kernel.org/all/[email protected]/
--- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +0 -6
@@ -1178,9 +1178,6 @@ static void mlx5e_shampo_update_ipv4_tcp_hdr(struct mlx5e_rq *rq, struct iphdr * skb->csum_start = (unsigned char *)tcp - skb->head; skb->csum_offset = offsetof(struct tcphdr , check); - -if (tcp->cwr) -skb_shinfo (skb)->gso_type |=SKB_GSO_TCP_ECN ; } static void mlx5e_shampo_update_ipv6_tcp_hdr(struct mlx5e_rq *rq, struct ipv6hdr *ipv6,
@@ -1199,9 +1196,6 @@ static void mlx5e_shampo_update_ipv6_tcp_hdr(struct mlx5e_rq *rq, struct ipv6hdrskb_shinfo (skb)->gso_type |=SKB_GSO_TCPV6 ; skb->csum_start = (unsigned char *)tcp - skb->head; skb->csum_offset = offsetof(struct tcphdr , check); - -if (tcp->cwr) -skb_shinfo (skb)->gso_type |=SKB_GSO_TCP_ECN ; }static void mlx5e_shampo_update_hdr (struct mlx5e_rq *rq,struct mlx5_cqe64 *cqe,bool match)
base-commit: 1df10cef2d1e7f9f2fb7eddb67fc70d3abf101f9
Signature · 1 line
2.44.0
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Thu, 23 Jul 2026 10:28:29 +0300 you wrote:
From: Dragos Tatulea <[email protected]>
mlx5e_shampo_update_ipv{4,6}_tcp_hdr() runs only from the
gro_count> 1 path inmlx5e_shampo_flush_skb(). HW-GRO flushes the current session on a CWR packet and delivers it as a single-segment skb vianapi_gro_receive(), so the aggregated (gro_count> 1) skb never carries a CWR-set TCP header.[...]
Here is the summary with links:
- [net-next] net/mlx5e: SHAMPO, Remove dead CWR handling in GRO header update
https://git.kernel.org/netdev/net-next/c/defbb6534ff3
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html