Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -2498,7 +2498,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
|
||||
name[val] = 0;
|
||||
|
||||
lock_sock(sk);
|
||||
err = tcp_set_congestion_control(sk, name, true);
|
||||
err = tcp_set_congestion_control(sk, name, true, true);
|
||||
release_sock(sk);
|
||||
return err;
|
||||
}
|
||||
|
Reference in New Issue
Block a user