diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-06-17 19:05:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-18 00:29:12 -0700 |
| commit | 31e6d363abcd0d05766c82f1a9c905a4c974a199 (patch) | |
| tree | f2b5c46354d95f91e743ae748b8add0de8bffd17 /net/netlink | |
| parent | d3b238a03efd6d644ff93c8b10a1d38a596f2e34 (diff) | |
| download | linux-3.10-31e6d363abcd0d05766c82f1a9c905a4c974a199.tar.gz linux-3.10-31e6d363abcd0d05766c82f1a9c905a4c974a199.tar.bz2 linux-3.10-31e6d363abcd0d05766c82f1a9c905a4c974a199.zip | |
net: correct off-by-one write allocations reports
commit 2b85a34e911bf483c27cfdd124aeb1605145dc80
(net: No more expensive sock_hold()/sock_put() on each tx)
changed initial sk_wmem_alloc value.
We need to take into account this offset when reporting
sk_wmem_alloc to user, in PROC_FS files or various
ioctls (SIOCOUTQ/TIOCOUTQ)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
| -rw-r--r-- | net/netlink/af_netlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 8b6bbb3032b..2936fa3b6dc 100644 --- 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) |