projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[firefly-linux-kernel-4.4.55.git]
/
net
/
decnet
/
af_decnet.c
diff --git
a/net/decnet/af_decnet.c
b/net/decnet/af_decnet.c
index a5e3a593e47224e8bd4a1a85ddd949141143816c..d351b8db0df5ceac6f6c566bb82cb9a700d78d2a 100644
(file)
--- a/
net/decnet/af_decnet.c
+++ b/
net/decnet/af_decnet.c
@@
-1240,7
+1240,7
@@
static int dn_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
return val;
case TIOCOUTQ:
- amount = sk->sk_sndbuf -
atomic_read(&sk->sk_wmem_alloc
);
+ amount = sk->sk_sndbuf -
sk_wmem_alloc_get(sk
);
if (amount < 0)
amount = 0;
err = put_user(amount, (int __user *)arg);