patch-2.4.0-test7 linux/net/ipv4/af_inet.c

• Lines: 37
• Date: Fri Aug 18 10:26:25 2000
• Orig file: v2.4.0-test6/linux/net/ipv4/af_inet.c
• Orig date: Wed Apr 26 16:34:09 2000

diff -u --recursive --new-file v2.4.0-test6/linux/net/ipv4/af_inet.c linux/net/ipv4/af_inet.c
@@ -5,7 +5,7 @@
  *
  *		PF_INET protocol family socket handler.
  *
- * Version:	$Id: af_inet.c,v 1.110 2000/04/25 04:13:34 davem Exp $
+ * Version:	$Id: af_inet.c,v 1.112 2000/08/16 16:20:56 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -159,6 +159,8 @@
 
 	BUG_TRAP(atomic_read(&sk->rmem_alloc) == 0);
 	BUG_TRAP(atomic_read(&sk->wmem_alloc) == 0);
+	BUG_TRAP(sk->wmem_queued == 0);
+	BUG_TRAP(sk->forward_alloc == 0);
 
 	if (sk->protinfo.af_inet.opt)
 		kfree(sk->protinfo.af_inet.opt);
@@ -300,9 +302,6 @@
 
 /*
  *	Create an inet socket.
- *
- *	FIXME: Gcc would generate much better code if we set the parameters
- *	up in in-memory structure order. Gcc68K even more so
  */
 
 static int inet_create(struct socket *sock, int protocol)
@@ -494,6 +493,8 @@
 		goto out;
 	}
 
+	if (sk->rcv_saddr)
+		sk->userlocks |= SOCK_BINDADDR_LOCK;
 	sk->sport = htons(sk->num);
 	sk->daddr = 0;
 	sk->dport = 0;