patch-2.1.86 linux/net/unix/af_unix.c

Next file: linux/net/x25/af_x25.c
Previous file: linux/net/sched/sch_tbf.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.85/linux/net/unix/af_unix.c linux/net/unix/af_unix.c
@@ -286,14 +286,14 @@
 		{
 			unix_socket *osk=skb->sk;
 			osk->state=TCP_CLOSE;
-			kfree_skb(skb, FREE_WRITE);	/* Now surplus - free the skb first before the socket */
+			kfree_skb(skb);			/* Now surplus - free the skb first before the socket */
 			osk->state_change(osk);		/* So the connect wakes and cleans up (if any) */
 			/* osk will be destroyed when it gets to close or the timer fires */			
 		}
 		else
 		{
 			/* passed fds are erased in the kfree_skb hook */
-			kfree_skb(skb,FREE_WRITE);
+			kfree_skb(skb);
 		}
 	}
 	
@@ -695,7 +695,7 @@
 		other=unix_find_other(sunaddr, addr_len, sk->type, hash, &err);
 		if(other==NULL)
 		{
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			return err;
 		}
 		other->ack_backlog++;
@@ -819,7 +819,7 @@
 		{
 			tsk=skb->sk;
 			tsk->state_change(tsk);
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			continue;
 		}
 		break;
@@ -838,7 +838,7 @@
 	unix_lock(newsk);		/* Swap lock over */
 	unix_unlock(sk);		/* Locked to child socket not master */
 	unix_lock(tsk);			/* Back lock */
-	kfree_skb(skb, FREE_WRITE);	/* The buffer is just used as a tag */
+	kfree_skb(skb);			/* The buffer is just used as a tag */
 	tsk->state_change(tsk);		/* Wake up any sleeping connect */
 	sock_wake_async(tsk->socket, 0);
 	return 0;
@@ -958,7 +958,7 @@
 		unix_peer(sk)=NULL;
 		other = NULL;
 		if (sunaddr == NULL) {
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			return -ECONNRESET;
 		}
 	}
@@ -968,13 +968,13 @@
 		
 		if (other==NULL)
 		{
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			return err;
 		}
 		if (!unix_may_send(sk, other))
 		{
 			unix_unlock(other);
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			return -EINVAL;
 		}
 	}
@@ -1080,7 +1080,7 @@
 
 		if (other->dead || (sk->shutdown & SEND_SHUTDOWN))
 		{
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			if(sent)
 				return sent;
 			send_sig(SIGPIPE,current,0);
@@ -1280,7 +1280,7 @@
 				break;
 			}
 
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 
 			if (scm->fp)
 				break;

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