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

Next file: linux/net/netbeui/netbeui_name.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.78/linux/net/ipx/af_ipx.c linux/net/ipx/af_ipx.c
@@ -415,14 +415,8 @@
 			if (copy != 0)
 			{
 				skb1 = skb_clone(skb, GFP_ATOMIC);
-				if (skb1 != NULL)
-				{
-					skb1->arp = 1;
-				}
-				else
-				{
+				if (skb1 == NULL)
 					return -ENOMEM;
-				}
 			}
 			else
 			{
@@ -515,8 +509,6 @@
 	if (copy)
 	{
 		skb1 = skb_clone(skb, GFP_ATOMIC);
-		if (skb1)
-			skb1->arp=1;
 	}
 	else
 	{
@@ -533,8 +525,6 @@
 	if (sock1 && sock2)
 	{
 		skb2 = skb_clone(skb1, GFP_ATOMIC);
-		if (skb2 != NULL)
-			skb2->arp = 1;
 	}
 	else
 		skb2 = skb1;
@@ -561,7 +551,6 @@
 
 	/* Hopefully, most cases */
 	if (in_offset >= out_offset) {
-		skb->arp = 1;
 		return skb;
 	}
 
@@ -572,11 +561,10 @@
 		skb_reserve(skb2,out_offset);
 		skb2->nh.raw=
 		skb2->h.raw=skb_put(skb2,skb->len);
-		skb2->arp=1;
 		memcpy(skb2->h.raw, skb->h.raw, skb->len);
 	}
 	kfree_skb(skb, FREE_WRITE);
-	return skb2;
+	return NULL;
 }
 
 static int ipxitf_send(ipx_interface *intrfc, struct sk_buff *skb, char *node)
@@ -1360,7 +1348,6 @@
 		return err;
 
 	skb_reserve(skb,ipx_offset);
-	skb->arp=1;
 	skb->sk=sk;
 
 	/* Fill in IPX header */

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