diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-16 21:25:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-16 21:25:48 -0400 |
| commit | caea902f72b053fd0c76d0d3b6b2e057beb3fc64 (patch) | |
| tree | 74e8d476b2c51480420e2ef7c9bbae249b6edbc9 /net/ipv4/raw.c | |
| parent | 0b4419162aa6c4204843f3a13b48d9ab821d3167 (diff) | |
| parent | 65c3e4715b1b934f8dcc002d9f46b4371ca7a9b1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/rt2x00usb.c
net/sctp/protocol.c
Diffstat (limited to 'net/ipv4/raw.c')
| -rw-r--r-- | net/ipv4/raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 36035a0c6dc2..7d449468409e 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c | |||
| @@ -931,7 +931,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i) | |||
| 931 | srcp = inet->num; | 931 | srcp = inet->num; |
| 932 | 932 | ||
| 933 | seq_printf(seq, "%4d: %08X:%04X %08X:%04X" | 933 | seq_printf(seq, "%4d: %08X:%04X %08X:%04X" |
| 934 | " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d", | 934 | " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d\n", |
| 935 | i, src, srcp, dest, destp, sp->sk_state, | 935 | i, src, srcp, dest, destp, sp->sk_state, |
| 936 | atomic_read(&sp->sk_wmem_alloc), | 936 | atomic_read(&sp->sk_wmem_alloc), |
| 937 | atomic_read(&sp->sk_rmem_alloc), | 937 | atomic_read(&sp->sk_rmem_alloc), |