patch-2.1.34 linux/net/ipx/af_ipx.c

Next file: linux/net/netbeui/af_netbeui.c
Previous file: linux/net/ipv6/udp.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.33/linux/net/ipx/af_ipx.c linux/net/ipx/af_ipx.c
@@ -1636,7 +1636,8 @@
 					htons(s->protinfo.af_ipx.dest_addr.sock));
 			}
 			len += sprintf (buffer+len,"%08X  %08X  ",
-				s->wmem_alloc, s->rmem_alloc);
+				atomic_read(&s->wmem_alloc),
+					atomic_read(&s->rmem_alloc));
 			len += sprintf (buffer+len,"%02X     %03d\n",
 				s->state, SOCK_INODE(s->socket)->i_uid);
 
@@ -2254,7 +2255,7 @@
 	switch(cmd)
 	{
 		case TIOCOUTQ:
-			amount=sk->sndbuf-sk->wmem_alloc;
+			amount = sk->sndbuf - atomic_read(&sk->wmem_alloc);
 			if(amount<0)
 				amount=0;
 			return put_user(amount, (int *)arg);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov