diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-26 18:33:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-26 18:33:26 -0700 |
| commit | 5c1f4cac6ff75a4a602bae960a054ed3df7e9765 (patch) | |
| tree | 31b0b05a41345e9dbf802a309ddf21eb506e8550 /net/llc/llc_proc.c | |
| parent | c6a519d2aac024d8ca5658bddd78af474b274e4b (diff) | |
| parent | 56e9b263242ca80a70abd8831343b268315c27dc (diff) | |
| download | kernel_samsung_smdk4412-5c1f4cac6ff75a4a602bae960a054ed3df7e9765.zip kernel_samsung_smdk4412-5c1f4cac6ff75a4a602bae960a054ed3df7e9765.tar.gz kernel_samsung_smdk4412-5c1f4cac6ff75a4a602bae960a054ed3df7e9765.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/llc/llc_proc.c')
| -rw-r--r-- | net/llc/llc_proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c index 36e8db3..bd531cb 100644 --- a/net/llc/llc_proc.c +++ b/net/llc/llc_proc.c @@ -134,7 +134,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); |