diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-02 10:29:46 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-02 10:29:46 -0400 |
| commit | d26978c0c1f7d69e9ca0abbc1cc62fa65c4e030f (patch) | |
| tree | 85bd3b58b623fc60f9ab50d2991193d9a5857b82 | |
| parent | 106bb74712a7926335598355f30e758dd337fc28 (diff) | |
| download | longterm-queue-4.8-d26978c0c1f7d69e9ca0abbc1cc62fa65c4e030f.tar.gz | |
tcp: update for the fact that 4.8 did not have multi-line indent
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/tcp-memset-ca_priv-data-to-0-properly.patch | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/queue/tcp-memset-ca_priv-data-to-0-properly.patch b/queue/tcp-memset-ca_priv-data-to-0-properly.patch index 17811d7..bf3b0fe 100644 --- a/queue/tcp-memset-ca_priv-data-to-0-properly.patch +++ b/queue/tcp-memset-ca_priv-data-to-0-properly.patch @@ -1,4 +1,4 @@ -From c1201444075009507a6818de6518e2822b9a87c8 Mon Sep 17 00:00:00 2001 +From a770ad82dd35b088dfd792a51c5807378a580fe8 Mon Sep 17 00:00:00 2001 From: Wei Wang <weiwan@google.com> Date: Tue, 25 Apr 2017 17:38:02 -0700 Subject: [PATCH] tcp: memset ca_priv data to 0 properly @@ -21,12 +21,14 @@ Acked-by: Eric Dumazet <edumazet@google.com> Acked-by: Yuchung Cheng <ycheng@google.com> Acked-by: Neal Cardwell <ncardwell@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +[PG: 4.8 diffstat is smaller, due to no need for {...} removal.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c -index 79c4817abc94..6e3c512054a6 100644 +index 882caa4e72bc..e5148d64a064 100644 --- a/net/ipv4/tcp_cong.c +++ b/net/ipv4/tcp_cong.c -@@ -168,12 +168,8 @@ void tcp_assign_congestion_control(struct sock *sk) +@@ -167,12 +167,8 @@ void tcp_assign_congestion_control(struct sock *sk) } out: rcu_read_unlock(); @@ -40,20 +42,14 @@ index 79c4817abc94..6e3c512054a6 100644 if (ca->flags & TCP_CONG_NEEDS_ECN) INET_ECN_xmit(sk); else -@@ -200,11 +196,10 @@ static void tcp_reinit_congestion_control(struct sock *sk, +@@ -199,6 +195,7 @@ static void tcp_reinit_congestion_control(struct sock *sk, tcp_cleanup_congestion_control(sk); icsk->icsk_ca_ops = ca; icsk->icsk_ca_setsockopt = 1; + memset(icsk->icsk_ca_priv, 0, sizeof(icsk->icsk_ca_priv)); -- if (sk->sk_state != TCP_CLOSE) { -- memset(icsk->icsk_ca_priv, 0, sizeof(icsk->icsk_ca_priv)); -+ if (sk->sk_state != TCP_CLOSE) + if (sk->sk_state != TCP_CLOSE) tcp_init_congestion_control(sk); -- } - } - - /* Manage refcounts on socket close. */ -- 2.12.0 |