fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / llc / llc_proc.c

diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
index c7de46e..19308fe 100644 (file)
--- a/net/llc/llc_proc.c
+++ b/net/llc/llc_proc.c
@@ -12,7 +12,6 @@
  * See the GNU General Public License for more details.
  */
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
@@ -65,7 +64,7 @@ static void *llc_seq_start(struct seq_file *seq, loff_t *pos)
 static void *llc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
        struct sock* sk, *next;
-       struct llc_opt *llc;
+       struct llc_sock *llc;
        struct llc_sap *sap;
 
        ++*pos;
@@ -102,7 +101,7 @@ static void llc_seq_stop(struct seq_file *seq, void *v)
 {
        if (v && v != SEQ_START_TOKEN) {
                struct sock *sk = v;
-               struct llc_opt *llc = llc_sk(sk);
+               struct llc_sock *llc = llc_sk(sk);
                struct llc_sap *sap = llc->sap;
 
                read_unlock_bh(&sap->sk_list.lock);
@@ -113,7 +112,7 @@ static void llc_seq_stop(struct seq_file *seq, void *v)
 static int llc_seq_socket_show(struct seq_file *seq, void *v)
 {
        struct sock* sk;
-       struct llc_opt *llc;
+       struct llc_sock *llc;
 
        if (v == SEQ_START_TOKEN) {
                seq_puts(seq, "SKt Mc local_mac_sap        remote_mac_sap   "
@@ -134,7 +133,7 @@ static int llc_seq_socket_show(struct seq_file *seq, void *v)
        llc_ui_format_mac(seq, llc->daddr.mac);
        seq_printf(seq, "@%02X %8d %8d %2d %3d %4d\n", llc->daddr.lsap,
                   atomic_read(&sk->sk_wmem_alloc),
-                  atomic_read(&sk->sk_rmem_alloc),
+                  atomic_read(&sk->sk_rmem_alloc) - llc->copied_seq,
                   sk->sk_state,
                   sk->sk_socket ? SOCK_INODE(sk->sk_socket)->i_uid : -1,
                   llc->link);
@@ -160,7 +159,7 @@ static char *llc_conn_state_names[] = {
 static int llc_seq_core_show(struct seq_file *seq, void *v)
 {
        struct sock* sk;
-       struct llc_opt *llc;
+       struct llc_sock *llc;
 
        if (v == SEQ_START_TOKEN) {
                seq_puts(seq, "Connection list:\n"