gssd_krb5: More arcfour-hmac support

[safe/jmp/linux-2.6] / net / ipv4 / tcp_diag.c

diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c
index b56399c..939edb3 100644 (file)
--- a/net/ipv4/tcp_diag.c
+++ b/net/ipv4/tcp_diag.c
@@ -1,8 +1,6 @@
 /*
  * tcp_diag.c  Module for monitoring TCP transport protocols sockets.
  *
- * Version:    $Id: tcp_diag.c,v 1.3 2002/02/01 22:01:04 davem Exp $
- *
  * Authors:    Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  *     This program is free software; you can redistribute it and/or
@@ -11,7 +9,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,16 +23,18 @@ 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;
 
-       if (sk->sk_state == TCP_LISTEN)
+       if (sk->sk_state == TCP_LISTEN) {
                r->idiag_rqueue = sk->sk_ack_backlog;
-       else
-               r->idiag_rqueue = tp->rcv_nxt - tp->copied_seq;
-       r->idiag_wqueue = tp->write_seq - tp->snd_una;
+               r->idiag_wqueue = sk->sk_max_ack_backlog;
+       } else {
+               r->idiag_rqueue = max_t(int, tp->rcv_nxt - tp->copied_seq, 0);
+               r->idiag_wqueue = tp->write_seq - tp->snd_una;
+       }
        if (info != NULL)
                tcp_get_info(sk, info);
 }
 
-static struct inet_diag_handler tcp_diag_handler = {
+static const struct inet_diag_handler tcp_diag_handler = {
        .idiag_hashinfo  = &tcp_hashinfo,
        .idiag_get_info  = tcp_diag_get_info,
        .idiag_type      = TCPDIAG_GETSOCK,
@@ -55,3 +54,4 @@ static void __exit tcp_diag_exit(void)
 module_init(tcp_diag_init);
 module_exit(tcp_diag_exit);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_INET_DIAG, TCPDIAG_GETSOCK);