diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-06-17 22:05:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-18 03:29:12 -0400 |
| commit | 31e6d363abcd0d05766c82f1a9c905a4c974a199 (patch) | |
| tree | f2b5c46354d95f91e743ae748b8add0de8bffd17 /net/netlink | |
| parent | d3b238a03efd6d644ff93c8b10a1d38a596f2e34 (diff) | |
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 8b6bbb3032b0..2936fa3b6dc8 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) | |||
| 1914 | s->sk_protocol, | 1914 | s->sk_protocol, |
| 1915 | nlk->pid, | 1915 | nlk->pid, |
| 1916 | nlk->groups ? (u32)nlk->groups[0] : 0, | 1916 | nlk->groups ? (u32)nlk->groups[0] : 0, |
| 1917 | atomic_read(&s->sk_rmem_alloc), | 1917 | sk_rmem_alloc_get(s), |
| 1918 | atomic_read(&s->sk_wmem_alloc), | 1918 | sk_wmem_alloc_get(s), |
| 1919 | nlk->cb, | 1919 | nlk->cb, |
| 1920 | atomic_read(&s->sk_refcnt), | 1920 | atomic_read(&s->sk_refcnt), |
| 1921 | atomic_read(&s->sk_drops) | 1921 | atomic_read(&s->sk_drops) |