diff options
| author | David S. Miller <davem@davemloft.net> | 2019-09-15 08:17:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-15 08:17:27 -0400 |
| commit | aa2eaa8c272a3211dec07ce9c6c863a7e355c10e (patch) | |
| tree | 8454a23d36b2ff36133c276ee0ba80eabc00850e /net/ipv4/tcp_input.c | |
| parent | a3d3c74da49c65fc63a937fa559186b0e16adca3 (diff) | |
| parent | 1609d7604b847a9820e63393d1a3b6cac7286d40 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor overlapping changes in the btusb and ixgbe drivers.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 706cbb3b2986..7e94223fdb2b 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -266,7 +266,7 @@ static void tcp_ecn_accept_cwr(struct sock *sk, const struct sk_buff *skb) | |||
| 266 | 266 | ||
| 267 | static void tcp_ecn_withdraw_cwr(struct tcp_sock *tp) | 267 | static void tcp_ecn_withdraw_cwr(struct tcp_sock *tp) |
| 268 | { | 268 | { |
| 269 | tp->ecn_flags &= ~TCP_ECN_DEMAND_CWR; | 269 | tp->ecn_flags &= ~TCP_ECN_QUEUE_CWR; |
| 270 | } | 270 | } |
| 271 | 271 | ||
| 272 | static void __tcp_ecn_check_ce(struct sock *sk, const struct sk_buff *skb) | 272 | static void __tcp_ecn_check_ce(struct sock *sk, const struct sk_buff *skb) |