Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[~andy/linux] / net / ieee802154 / dgram.c

diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c
index 1779677aed46f16ecae9d0e8c880a7052391c18a..14d39840dd62e736e9dfb96efc011c5b41dd92ab 100644 (file)
--- a/net/ieee802154/dgram.c
+++ b/net/ieee802154/dgram.c
@@ -126,7 +126,8 @@ static int dgram_ioctl(struct sock *sk, int cmd, unsigned long arg)
        switch (cmd) {
        case SIOCOUTQ:
        {
-               int amount = atomic_read(&sk->sk_wmem_alloc);
+               int amount = sk_wmem_alloc_get(sk);
+
                return put_user(amount, (int __user *)arg);
        }