diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /net/ipv4/tcp_diag.c | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'net/ipv4/tcp_diag.c')
| -rw-r--r-- | net/ipv4/tcp_diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c index fcbcd4ff6c5f..939edb3b8e4d 100644 --- a/net/ipv4/tcp_diag.c +++ b/net/ipv4/tcp_diag.c | |||
| @@ -27,7 +27,7 @@ static void tcp_diag_get_info(struct sock *sk, struct inet_diag_msg *r, | |||
| 27 | r->idiag_rqueue = sk->sk_ack_backlog; | 27 | r->idiag_rqueue = sk->sk_ack_backlog; |
| 28 | r->idiag_wqueue = sk->sk_max_ack_backlog; | 28 | r->idiag_wqueue = sk->sk_max_ack_backlog; |
| 29 | } else { | 29 | } else { |
| 30 | r->idiag_rqueue = tp->rcv_nxt - tp->copied_seq; | 30 | r->idiag_rqueue = max_t(int, tp->rcv_nxt - tp->copied_seq, 0); |
| 31 | r->idiag_wqueue = tp->write_seq - tp->snd_una; | 31 | r->idiag_wqueue = tp->write_seq - tp->snd_una; |
| 32 | } | 32 | } |
| 33 | if (info != NULL) | 33 | if (info != NULL) |