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/irda/af_irda.c | |
| parent | d3b238a03efd6d644ff93c8b10a1d38a596f2e34 (diff) | |
| download | lwn-31e6d363abcd0d05766c82f1a9c905a4c974a199.tar.gz lwn-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/irda/af_irda.c')
| -rw-r--r-- | net/irda/af_irda.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index 3eb5bcc75f99..5922febe25c4 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -1762,7 +1762,8 @@ static int irda_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) switch (cmd) { case TIOCOUTQ: { long amount; - amount = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc); + + amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk); if (amount < 0) amount = 0; if (put_user(amount, (unsigned int __user *)arg)) |