patch-1.3.65 linux/net/ax25/af_ax25.c

Next file: linux/net/ax25/ax25_subr.c
Previous file: linux/net/appletalk/ddp.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.64/linux/net/ax25/af_ax25.c linux/net/ax25/af_ax25.c
@@ -947,7 +947,7 @@
 	sk->sndbuf        = SK_WMEM_MAX;
 	sk->wmem_alloc    = 0;
 	sk->rmem_alloc    = 0;
-	sk->inuse         = 0;
+	sk->users         = 0;
 	sk->debug         = 0;
 	sk->destroy       = 0;
 	sk->prot          = NULL;	/* So we use default free mechanisms */
@@ -1020,7 +1020,7 @@
 	sk->sndbuf      = osk->sndbuf;
 	sk->wmem_alloc  = 0;
 	sk->rmem_alloc  = 0;
-	sk->inuse       = 0;
+	sk->users       = 0;
 	sk->ack_backlog = 0;
 	sk->destroy     = 0;
 	sk->prot        = NULL;	/* So we use default free mechanisms */
@@ -1988,7 +1988,7 @@
 		}
 	}
 
-	skb_free_datagram(skb);
+	skb_free_datagram(sk, skb);
 
 	return copied;
 }		

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