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/x25/af_x25.c | |
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/x25/af_x25.c')
-rw-r--r-- | net/x25/af_x25.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 8cd2390b0d45..21cdc872004e 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c | |||
@@ -1271,8 +1271,8 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | |||
1271 | 1271 | ||
1272 | switch (cmd) { | 1272 | switch (cmd) { |
1273 | case TIOCOUTQ: { | 1273 | case TIOCOUTQ: { |
1274 | int amount = sk->sk_sndbuf - | 1274 | int amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk); |
1275 | atomic_read(&sk->sk_wmem_alloc); | 1275 | |
1276 | if (amount < 0) | 1276 | if (amount < 0) |
1277 | amount = 0; | 1277 | amount = 0; |
1278 | rc = put_user(amount, (unsigned int __user *)argp); | 1278 | rc = put_user(amount, (unsigned int __user *)argp); |