We discovered some problems caused by the recent merge of SO_PEEK_OFF support. 1/2 is a fix from Jon, modified by Stefano. 2/2 is a fix for a different issue. David Gibson (1): tcp: Correctly update SO_PEEK_OFF when tcp_send_frames() drops frames Jon Maloy (1): tcp: probe for SO_PEEK_OFF both in tcpv4 and tcp6 tcp.c | 37 +++++++++++++++++++++++++------------ tcp_buf.c | 23 ++++++++++++++--------- tcp_buf.h | 2 +- 3 files changed, 40 insertions(+), 22 deletions(-) -- 2.45.2