diff options
| author | Paul Moore <pmoore@redhat.com> | 2013-11-26 17:32:55 -0500 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2013-11-26 17:32:55 -0500 |
| commit | dd0a11815a339d6deeea8357574f8126a8404c92 (patch) | |
| tree | c3c743ac6323e1caf9e987d6946cc4b2333a8256 /net/ipx/ipx_proc.c | |
| parent | 42d64e1add3a1ce8a787116036163b8724362145 (diff) | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
Merge tag 'v3.12'
Linux 3.12
Diffstat (limited to 'net/ipx/ipx_proc.c')
| -rw-r--r-- | net/ipx/ipx_proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c index 65e8833a2510..e15c16a517e7 100644 --- a/net/ipx/ipx_proc.c +++ b/net/ipx/ipx_proc.c | |||
| @@ -213,7 +213,7 @@ static int ipx_seq_socket_show(struct seq_file *seq, void *v) | |||
| 213 | ntohs(ipxs->dest_addr.sock)); | 213 | ntohs(ipxs->dest_addr.sock)); |
| 214 | } | 214 | } |
| 215 | 215 | ||
| 216 | seq_printf(seq, "%08X %08X %02X %03d\n", | 216 | seq_printf(seq, "%08X %08X %02X %03u\n", |
| 217 | sk_wmem_alloc_get(s), | 217 | sk_wmem_alloc_get(s), |
| 218 | sk_rmem_alloc_get(s), | 218 | sk_rmem_alloc_get(s), |
| 219 | s->sk_state, | 219 | s->sk_state, |