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

Next file: linux/net/netrom/af_netrom.c
Previous file: linux/net/ipv4/udp.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.64/linux/net/ipx/af_ipx.c linux/net/ipx/af_ipx.c
@@ -1032,6 +1032,7 @@
 			ipxif=ipxitf_find_using_phys(dev, ipx_map_frame_type(sipx->sipx_type));
 			if(ipxif==NULL)
 				return -EADDRNOTAVAIL;
+			sipx->sipx_family=AF_IPX;
 			sipx->sipx_network=ipxif->if_netnum;
 			memcpy(sipx->sipx_node, ipxif->if_node, sizeof(sipx->sipx_node));
 			memcpy_tofs(arg,&ifr,sizeof(ifr));
@@ -1601,7 +1602,7 @@
 	sk->sndbuf=SK_WMEM_MAX;
 	sk->wmem_alloc=0;
 	sk->rmem_alloc=0;
-	sk->inuse=0;
+	sk->users=0;
 	sk->shutdown=0;
 	sk->prot=NULL;	/* So we use default free mechanisms */
 	sk->err=0;
@@ -2050,7 +2051,7 @@
 		sipx->sipx_network=ipx->ipx_source.net;
 		sipx->sipx_type = ipx->ipx_type;
 	}
-	skb_free_datagram(skb);
+	skb_free_datagram(sk, skb);
 	return(truesize);
 }		
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this