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

• Lines: 65
• Date: Tue Dec 26 06:03:02 1995
• Orig file: v1.3.50/linux/net/ipx/af_ipx.c
• Orig date: Mon Dec 11 15:42:11 1995

diff -u --recursive --new-file v1.3.50/linux/net/ipx/af_ipx.c linux/net/ipx/af_ipx.c
@@ -404,19 +404,8 @@
 	 * that skb1 and skb2 point to it (them) so that it (they) can be 
 	 * demuxed to sock1 and/or sock2.  If we are unable to make enough
 	 * copies, we do as much as is possible.
-	 *
-	 * Firstly stop charging the sender for the space. We will
-	 * charge the recipient or discard. If we are called from ipx_rcv
-	 * this is ok as no socket owns an input buffer.
 	 */
 	 
-	if(skb->sk && !copy)
-	{
-		skb->sk->wmem_alloc -= skb->truesize;	/* Adjust */
-		skb->sk=NULL;				/* Disown */
-	}
-
-	 
 	if (copy) 
 	{
 		skb1 = skb_clone(skb, GFP_ATOMIC);
@@ -499,7 +488,7 @@
 	 */
 	 
 	if ((dl == NULL) || (dev == NULL) || (dev->flags & IFF_LOOPBACK)) 
-		send_to_wire = 0;
+		send_to_wire = 0;	/* No non looped */
 
 	/*
 	 *	See if this should be demuxed to sockets on this interface 
@@ -514,12 +503,24 @@
 		 *	To our own node, loop and free the original.
 		 */
 		if (memcmp(intrfc->if_node, node, IPX_NODE_LEN) == 0) 
+		{
+			/*
+			 *	Don't charge sender
+			 */
+			if(skb->sk)
+				skb->sk->wmem_alloc-=skb->truesize;
+			/*
+			 *	Will charge receiver
+			 */
 			return ipxitf_demux_socket(intrfc, skb, 0);
+		}
 		/*
 		 *	Broadcast, loop and possibly keep to send on.
 		 */
 		if (memcmp(ipx_broadcast_node, node, IPX_NODE_LEN) == 0) 
 		{
+			if (!send_to_wire && skb->sk)
+				skb->sk->wmem_alloc-=skb->truesize;
 			ipxitf_demux_socket(intrfc, skb, send_to_wire);
 			if (!send_to_wire) 
 				return 0;
@@ -527,7 +528,9 @@
 	}
 
 	/*
-	 *	if the originating net is not equal to our net; this is routed 
+	 *	If the originating net is not equal to our net; this is routed 
+	 *	We are still charging the sender. Which is right - the driver
+	 *	free will handle this fairly.
 	 */
 	 
 	if (ipx->ipx_source.net != intrfc->if_netnum)