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 'fix/hda' into for-linus
[pandora-kernel.git]
/
net
/
atm
/
ioctl.c
diff --git
a/net/atm/ioctl.c
b/net/atm/ioctl.c
index
76ed3c8
..
4da8892
100644
(file)
--- a/
net/atm/ioctl.c
+++ b/
net/atm/ioctl.c
@@
-63,8
+63,7
@@
static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg
error = -EINVAL;
goto done;
}
- error = put_user(sk->sk_sndbuf -
- atomic_read(&sk->sk_wmem_alloc),
+ error = put_user(sk->sk_sndbuf - sk_wmem_alloc_get(sk),
(int __user *) argp) ? -EFAULT : 0;
goto done;
case SIOCINQ: