[Bluetooth] Remove global conf_mtu variable from L2CAP

[pandora-kernel.git] / net / ipv4 / tcp_diag.c

diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c
index c148c10..3904d21 100644 (file)
--- a/net/ipv4/tcp_diag.c
+++ b/net/ipv4/tcp_diag.c
@@ -11,7 +11,6 @@
  *      2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 
 #include <linux/module.h>
 #include <linux/inet_diag.h>
@@ -26,8 +25,13 @@ static void tcp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,
        const struct tcp_sock *tp = tcp_sk(sk);
        struct tcp_info *info = _info;
 
-       r->idiag_rqueue = tp->rcv_nxt - tp->copied_seq;
-       r->idiag_wqueue = tp->write_seq - tp->snd_una;
+       if (sk->sk_state == TCP_LISTEN) {
+               r->idiag_rqueue = sk->sk_ack_backlog;
+               r->idiag_wqueue = sk->sk_max_ack_backlog;
+       } else {
+               r->idiag_rqueue = tp->rcv_nxt - tp->copied_seq;
+               r->idiag_wqueue = tp->write_seq - tp->snd_una;
+       }
        if (info != NULL)
                tcp_get_info(sk, info);
 }