Modification for ACCECN draft

minuscat · Jan 19, 2024 · 3a8bee9 · 3a8bee9
1 parent ae3f31d
commit 3a8bee9
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
@@ -414,11 +414,7 @@ bool tcp_accecn_third_ack(struct sock *sk, const struct sk_buff *skb,
 		if (!TCP_SKB_CB(skb)->sacked) {
 		    inet_rsk(req)->ecn_ok = 0;
 		    tcp_rsk(req)->accecn_ok = 0;
-
 		    tcp_ecn_mode_set(tp, TCP_ECN_DISABLED);
-		    tp->prev_ecnfield = treq->syn_ect_rcv;
-		    tp->accecn_opt_demand = 1;
-		    tcp_ecn_received_counters(sk, skb, skb->len - th->doff * 4);
 		    verify_ace = false;
 		}
 		break;
@@ -457,10 +453,10 @@ static void tcp_ecn_openreq_child(struct sock *sk,
 	        tcp_ecn_mode_set(tp, TCP_ECN_MODE_ACCECN);
 	        tp->syn_ect_snt = treq->syn_ect_snt;
 	        tp->saw_accecn_opt = treq->saw_accecn_opt;
-	        tp->prev_ecnfield = treq->syn_ect_rcv;
-	        tp->accecn_opt_demand = 1;
-	        tcp_ecn_received_counters(sk, skb, skb->len - th->doff * 4);
 	    }
+	    tp->prev_ecnfield = treq->syn_ect_rcv;
+	    tp->accecn_opt_demand = 1;
+	    tcp_ecn_received_counters(sk, skb, skb->len - th->doff * 4);
 	} else {
 	    tcp_ecn_mode_set(tp, inet_rsk(req)->ecn_ok && !tcp_ca_no_fallback_rfc3168(sk) ?
 	    		     TCP_ECN_MODE_RFC3168 :