diff options
| author |   Stefano Brivio <sbrivio@redhat.com> | 2018-01-05 00:38:05 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-01-08 14:12:26 -0500 |
| commit | c8c9aeb519496f403563c715616dfc2a921a7eae (patch) | |
| tree | f5f87fc6fc90d5581bf5a1b2893bee30dc466491 | |
| parent | net: ipv6: Allow connect to linklocal address from socket bound to vrf (diff) | |
| download | linux-dev-c8c9aeb519496f403563c715616dfc2a921a7eae.tar.xz linux-dev-c8c9aeb519496f403563c715616dfc2a921a7eae.zip | |
tcp: Split BUG_ON() in tcp_tso_should_defer() into two assertions
The two conditions triggering BUG_ON() are somewhat unrelated:
the tcp_skb_pcount() check is meant to catch TSO flaws, the
second one checks sanity of congestion window bookkeeping.
Split them into two separate BUG_ON() assertions on two lines,
so that we know which one actually triggers, when they do.
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/tcp_output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 04be9f833927..95461f02ac9a 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1944,7 +1944,8 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb, in_flight = tcp_packets_in_flight(tp); - BUG_ON(tcp_skb_pcount(skb) <= 1 || (tp->snd_cwnd <= in_flight)); + BUG_ON(tcp_skb_pcount(skb) <= 1); + BUG_ON(tp->snd_cwnd <= in_flight); send_win = tcp_wnd_end(tp) - TCP_SKB_CB(skb)->seq; |