diff --git a/[refs] b/[refs] index e2c3609eaada..92d6b7957c01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b6d427bb7eb69e6dc4f194a5b0f4a382a16ff82 +refs/heads/master: b9c4595bc4947faa236a849324fe3492e388d949 diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h index 064c92fe00d2..b92bdc7c92a9 100644 --- a/trunk/include/net/tcp.h +++ b/trunk/include/net/tcp.h @@ -758,8 +758,8 @@ static inline __u32 tcp_current_ssthresh(const struct sock *sk) (tp->snd_cwnd >> 2))); } -/* Use define here intentionally to get BUG_ON location shown at the caller */ -#define tcp_verify_left_out(tp) BUG_ON(tcp_left_out(tp) > tp->packets_out) +/* Use define here intentionally to get WARN_ON location shown at the caller */ +#define tcp_verify_left_out(tp) WARN_ON(tcp_left_out(tp) > tp->packets_out) extern void tcp_enter_cwr(struct sock *sk, const int set_ssthresh); extern __u32 tcp_init_cwnd(struct tcp_sock *tp, struct dst_entry *dst);