diff options
Diffstat (limited to 'net/ax25')
-rw-r--r-- | net/ax25/af_ax25.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index 61b35b955490..da0f64f82b57 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c | |||
@@ -1690,7 +1690,8 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | |||
1690 | switch (cmd) { | 1690 | switch (cmd) { |
1691 | case TIOCOUTQ: { | 1691 | case TIOCOUTQ: { |
1692 | long amount; | 1692 | long amount; |
1693 | amount = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc); | 1693 | |
1694 | amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk); | ||
1694 | if (amount < 0) | 1695 | if (amount < 0) |
1695 | amount = 0; | 1696 | amount = 0; |
1696 | res = put_user(amount, (int __user *)argp); | 1697 | res = put_user(amount, (int __user *)argp); |
@@ -1780,8 +1781,8 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | |||
1780 | ax25_info.idletimer = ax25_display_timer(&ax25->idletimer) / (60 * HZ); | 1781 | ax25_info.idletimer = ax25_display_timer(&ax25->idletimer) / (60 * HZ); |
1781 | ax25_info.n2count = ax25->n2count; | 1782 | ax25_info.n2count = ax25->n2count; |
1782 | ax25_info.state = ax25->state; | 1783 | ax25_info.state = ax25->state; |
1783 | ax25_info.rcv_q = atomic_read(&sk->sk_rmem_alloc); | 1784 | ax25_info.rcv_q = sk_wmem_alloc_get(sk); |
1784 | ax25_info.snd_q = atomic_read(&sk->sk_wmem_alloc); | 1785 | ax25_info.snd_q = sk_rmem_alloc_get(sk); |
1785 | ax25_info.vs = ax25->vs; | 1786 | ax25_info.vs = ax25->vs; |
1786 | ax25_info.vr = ax25->vr; | 1787 | ax25_info.vr = ax25->vr; |
1787 | ax25_info.va = ax25->va; | 1788 | ax25_info.va = ax25->va; |
@@ -1921,8 +1922,8 @@ static int ax25_info_show(struct seq_file *seq, void *v) | |||
1921 | 1922 | ||
1922 | if (ax25->sk != NULL) { | 1923 | if (ax25->sk != NULL) { |
1923 | seq_printf(seq, " %d %d %lu\n", | 1924 | seq_printf(seq, " %d %d %lu\n", |
1924 | atomic_read(&ax25->sk->sk_wmem_alloc), | 1925 | sk_wmem_alloc_get(ax25->sk), |
1925 | atomic_read(&ax25->sk->sk_rmem_alloc), | 1926 | sk_rmem_alloc_get(ax25->sk), |
1926 | sock_i_ino(ax25->sk)); | 1927 | sock_i_ino(ax25->sk)); |
1927 | } else { | 1928 | } else { |
1928 | seq_puts(seq, " * * *\n"); | 1929 | seq_puts(seq, " * * *\n"); |