From: Chia-Yu Chang <chia-yu.ch...@nokia-bell-labs.com>

In Accurate ECN, ACE counter (AE, ECE, CWR flags) changes only when new
CE packets arrive, while setting SKB_GSO_TCP_ECN in case of not knowing
the ECN variant can result in header change that corrupts the ACE field.
The new flag SKB_GSO_TCP_ACCECN is to prevent SKB_GSO_TCP_ECN or
NETIF_F_TSO_ECN offloading to be used because they would corrupt CWR
flag somewhere.

Signed-off-by: Chia-Yu Chang <chia-yu.ch...@nokia-bell-labs.com>
---
 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c 
b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 43377a7b2426..a6238a625d6f 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -3855,7 +3855,7 @@ static int hns3_gro_complete(struct sk_buff *skb, u32 
l234info)
 
        skb_shinfo(skb)->gso_segs = NAPI_GRO_CB(skb)->count;
        if (th->cwr)
-               skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ECN;
+               skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ACCECN;
 
        if (l234info & BIT(HNS3_RXD_GRO_FIXID_B))
                skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_FIXEDID;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c 
b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index 1963bc5adb18..b9611cc223b3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -1286,7 +1286,7 @@ static void mlx5e_shampo_update_ipv4_tcp_hdr(struct 
mlx5e_rq *rq, struct iphdr *
        skb->csum_offset = offsetof(struct tcphdr, check);
 
        if (tcp->cwr)
-               skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ECN;
+               skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ACCECN;
 }
 
 static void mlx5e_shampo_update_ipv6_tcp_hdr(struct mlx5e_rq *rq, struct 
ipv6hdr *ipv6,
@@ -1307,7 +1307,7 @@ static void mlx5e_shampo_update_ipv6_tcp_hdr(struct 
mlx5e_rq *rq, struct ipv6hdr
        skb->csum_offset = offsetof(struct tcphdr, check);
 
        if (tcp->cwr)
-               skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ECN;
+               skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ACCECN;
 }
 
 static void mlx5e_shampo_update_hdr(struct mlx5e_rq *rq, struct mlx5_cqe64 
*cqe, bool match)
-- 
2.34.1


Reply via email to