Merge branch 'xenpacer-cwnd' into xenpacer-exp

net/ipv4/tcp_input.c

@@ -2915,6 +2915,7 @@ void ptcp_mark_head_lost(struct sock *sk, int packets, int mark_head)
         ptcp_ret = ptcp_build_rexmit_dummy(sk, &ptcp_skb, tp->snd_una,
             tp->rcv_nxt, TCPCB_LOST);
         if (!ptcp_ret) {
+#if 0
           TCP_SKB_CB(ptcp_skb)->caller = 8;
           TCP_SKB_CB(ptcp_skb)->c_ca = inet_csk(sk)->icsk_ca_state;
           TCP_SKB_CB(ptcp_skb)->lock_owner = sk->sk_lock.owned;
@@ -2925,6 +2926,7 @@ void ptcp_mark_head_lost(struct sock *sk, int packets, int mark_head)
           TCP_SKB_CB(ptcp_skb)->c_synced_pkts = 0;
           TCP_SKB_CB(ptcp_skb)->c_synced_snd_nxt = tp->snd_nxt;
           TCP_SKB_CB(ptcp_skb)->c_synced_snd_una = tp->snd_una;
+#endif
           __tcp_add_write_queue_head(sk, ptcp_skb);
           head_skb = ptcp_skb;
           update_var_atomic(&tp->lost_out, 1);
@@ -2941,6 +2943,7 @@ void ptcp_mark_head_lost(struct sock *sk, int packets, int mark_head)
         ptcp_ret = ptcp_build_rexmit_dummy(sk, &ptcp_skb, curr_seq,
             tp->rcv_nxt, TCPCB_LOST);
         if (!ptcp_ret) {
+#if 0
           TCP_SKB_CB(ptcp_skb)->caller = 9;
           TCP_SKB_CB(ptcp_skb)->c_ca = inet_csk(sk)->icsk_ca_state;
           TCP_SKB_CB(ptcp_skb)->lock_owner = sk->sk_lock.owned;
@@ -2951,6 +2954,7 @@ void ptcp_mark_head_lost(struct sock *sk, int packets, int mark_head)
           TCP_SKB_CB(ptcp_skb)->c_synced_pkts = 0;
           TCP_SKB_CB(ptcp_skb)->c_synced_snd_nxt = tp->snd_nxt;
           TCP_SKB_CB(ptcp_skb)->c_synced_snd_una = tp->snd_una;
+#endif
           if (prev_skb) {
             __skb_queue_after(&sk->sk_write_queue, prev_skb, ptcp_skb);
           } else {