Content-Type: multipart/mixed; boundary="===============8554328848911803380==" MIME-Version: 1.0 From: Christoph Paasch To: mptcp at lists.01.org Subject: [MPTCP] [PATCH v2 03/25] tcp: Pass skb in tcp_options_write Date: Mon, 27 Nov 2017 21:57:04 -0800 Message-ID: <20171128055726.430-4-cpaasch@apple.com> In-Reply-To: 20171128055726.430-1-cpaasch@apple.com X-Status: X-Keywords: X-UID: 177 --===============8554328848911803380== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable We will need it to allow TCP_MD5 to compute the hash. Signed-off-by: Christoph Paasch --- net/ipv4/tcp_output.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 6937098fb2b5..751396f22bb3 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -444,7 +444,7 @@ struct tcp_out_options { * At least SACK_PERM as the first option is known to lead to a disaster * (but it may well be that other scenarios fail similarly). */ -static void tcp_options_write(__be32 *ptr, struct sock *sk, +static void tcp_options_write(__be32 *ptr, struct sk_buff *skb, struct soc= k *sk, struct tcp_out_options *opts) { u16 options =3D opts->options; /* mungable copy */ @@ -1140,7 +1140,7 @@ static int tcp_transmit_skb(struct sock *sk, struct s= k_buff *skb, int clone_it, */ th->window =3D htons(min(tp->rcv_wnd, 65535U)); } - tcp_options_write((__be32 *)(th + 1), sk, &opts); + tcp_options_write((__be32 *)(th + 1), skb, sk, &opts); #ifdef CONFIG_TCP_MD5SIG /* Calculate the MD5 hash, as we have all we need now */ if (md5) { @@ -3250,7 +3250,7 @@ struct sk_buff *tcp_make_synack(const struct sock *sk= , struct dst_entry *dst, /* RFC1323: The window in SYN & SYN/ACK segments is never scaled. */ th->window =3D htons(min(req->rsk_rcv_wnd, 65535U)); th->doff =3D (tcp_header_size >> 2); - tcp_options_write((__be32 *)(th + 1), req_to_sk(req), &opts); + tcp_options_write((__be32 *)(th + 1), skb, req_to_sk(req), &opts); __TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS); = #ifdef CONFIG_TCP_MD5SIG -- = 2.15.0 --===============8554328848911803380==--