git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
[pandora-kernel.git]
/
net
/
netlink
/
af_netlink.c
diff --git
a/net/netlink/af_netlink.c
b/net/netlink/af_netlink.c
index
8b6bbb3
..
2936fa3
100644
(file)
--- a/
net/netlink/af_netlink.c
+++ b/
net/netlink/af_netlink.c
@@
-1914,8
+1914,8
@@
static int netlink_seq_show(struct seq_file *seq, void *v)
s->sk_protocol,
nlk->pid,
nlk->groups ? (u32)nlk->groups[0] : 0,
-
atomic_read(&s->sk_rmem_alloc
),
-
atomic_read(&s->sk_wmem_alloc
),
+
sk_rmem_alloc_get(s
),
+
sk_wmem_alloc_get(s
),
nlk->cb,
atomic_read(&s->sk_refcnt),
atomic_read(&s->sk_drops)