Re: [PATCH net 1/2] tcp: Merge tx_flags and tskey in tcp_collapse_retrans

2016-04-20 Thread Soheil Hassas Yeganeh
On Wed, Apr 20, 2016 at 1:39 AM, Martin KaFai Lau wrote: > If two skbs are merged/collapsed during retransmission, the current > logic does not merge the tx_flags and tskey. The end result is > the SCM_TSTAMP_ACK timestamp could be missing for a packet. > > The patch: > 1. Merge the tx_flags > 2.

[PATCH net 1/2] tcp: Merge tx_flags and tskey in tcp_collapse_retrans

2016-04-19 Thread Martin KaFai Lau
If two skbs are merged/collapsed during retransmission, the current logic does not merge the tx_flags and tskey. The end result is the SCM_TSTAMP_ACK timestamp could be missing for a packet. The patch: 1. Merge the tx_flags 2. Overwrite the prev_skb's tskey with the next_skb's tskey BPF Output B