patch-2.1.34 linux/net/rose/af_rose.c

• Lines: 28
• Date: Mon Apr 14 09:31:10 1997
• Orig file: v2.1.33/linux/net/rose/af_rose.c
• Orig date: Mon Apr 7 11:35:33 1997

diff -u --recursive --new-file v2.1.33/linux/net/rose/af_rose.c linux/net/rose/af_rose.c
@@ -357,7 +357,8 @@
 		kfree_skb(skb, FREE_READ);
 	}
 
-	if (sk->wmem_alloc != 0 || sk->rmem_alloc != 0) {	/* Defer: outstanding buffers */
+	if (atomic_read(&sk->wmem_alloc) != 0 || atomic_read(&sk->rmem_alloc) != 0) {
+		/* Defer: outstanding buffers */
 		init_timer(&sk->timer);
 		sk->timer.expires  = jiffies + 10 * HZ;
 		sk->timer.function = rose_destroy_timer;
@@ -1184,7 +1185,7 @@
 		case TIOCOUTQ:
 			if ((err = verify_area(VERIFY_WRITE, (void *)arg, sizeof(unsigned int))) != 0)
 				return err;
-			amount = sk->sndbuf - sk->wmem_alloc;
+			amount = sk->sndbuf - atomic_read(&sk->wmem_alloc);
 			if (amount < 0)
 				amount = 0;
 			put_user(amount, (unsigned int *)arg);
@@ -1290,7 +1291,7 @@
 			s->protinfo.rose->t2    / ROSE_SLOWHZ,
 			s->protinfo.rose->t3    / ROSE_SLOWHZ,
 			s->protinfo.rose->hb    / ROSE_SLOWHZ,
-			s->wmem_alloc, s->rmem_alloc);
+			atomic_read(&s->wmem_alloc), atomic_read(&s->rmem_alloc));
 
 		pos = begin + len;