aboutsummaryrefslogtreecommitdiffstats
path: root/net/rose/af_rose.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/rose/af_rose.c')
-rw-r--r--net/rose/af_rose.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 4dd9a7d18945..6bd8e93869ed 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1309,7 +1309,8 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
1309 switch (cmd) { 1309 switch (cmd) {
1310 case TIOCOUTQ: { 1310 case TIOCOUTQ: {
1311 long amount; 1311 long amount;
1312 amount = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc); 1312
1313 amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
1313 if (amount < 0) 1314 if (amount < 0)
1314 amount = 0; 1315 amount = 0;
1315 return put_user(amount, (unsigned int __user *) argp); 1316 return put_user(amount, (unsigned int __user *) argp);
@@ -1480,8 +1481,8 @@ static int rose_info_show(struct seq_file *seq, void *v)
1480 rose->hb / HZ, 1481 rose->hb / HZ,
1481 ax25_display_timer(&rose->idletimer) / (60 * HZ), 1482 ax25_display_timer(&rose->idletimer) / (60 * HZ),
1482 rose->idle / (60 * HZ), 1483 rose->idle / (60 * HZ),
1483 atomic_read(&s->sk_wmem_alloc), 1484 sk_wmem_alloc_get(s),
1484 atomic_read(&s->sk_rmem_alloc), 1485 sk_rmem_alloc_get(s),
1485 s->sk_socket ? SOCK_INODE(s->sk_socket)->i_ino : 0L); 1486 s->sk_socket ? SOCK_INODE(s->sk_socket)->i_ino : 0L);
1486 } 1487 }
1487 1488