patch-2.1.34 linux/net/appletalk/ddp.c

• Lines: 20
• Date: Mon Apr 14 09:31:10 1997
• Orig file: v2.1.33/linux/net/appletalk/ddp.c
• Orig date: Fri Apr 4 08:52:26 1997

diff -u --recursive --new-file v2.1.33/linux/net/appletalk/ddp.c linux/net/appletalk/ddp.c
@@ -198,7 +198,9 @@
 			ntohs(s->protinfo.af_at.dest_net),
 			s->protinfo.af_at.dest_node,
 			s->protinfo.af_at.dest_port);
-		len += sprintf (buffer+len,"%08X:%08X ", s->wmem_alloc, s->rmem_alloc);
+		len += sprintf (buffer+len,"%08X:%08X ",
+				atomic_read(&s->wmem_alloc),
+				atomic_read(&s->rmem_alloc));
 		len += sprintf (buffer+len,"%02X %d\n", s->state, SOCK_INODE(s->socket)->i_uid);
 
 		/* Are we still dumping unwanted data then discard the record */
@@ -1891,7 +1893,7 @@
 		 *	Protocol layer
 		 */
 		case TIOCOUTQ:
-			amount=sk->sndbuf-sk->wmem_alloc;
+			amount = sk->sndbuf - atomic_read(&sk->wmem_alloc);
 			if(amount<0)
 				amount=0;
 			break;