patch-2.3.15 linux/net/netrom/af_netrom.c

• Lines: 47
• Date: Mon Aug 23 10:01:02 1999
• Orig file: v2.3.14/linux/net/netrom/af_netrom.c
• Orig date: Wed Aug 18 11:38:49 1999

diff -u --recursive --new-file v2.3.14/linux/net/netrom/af_netrom.c linux/net/netrom/af_netrom.c
@@ -545,7 +545,7 @@
 	return sk;
 }
 
-static int nr_release(struct socket *sock, struct socket *peer)
+static int nr_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
 
@@ -747,11 +747,6 @@
 	struct sock *newsk;
 	struct sk_buff *skb;
 
-	if (newsock->sk != NULL)
-		nr_destroy_socket(newsock->sk);
-
-	newsock->sk = NULL;
-
 	if ((sk = sock->sk) == NULL)
 		return -EINVAL;
 
@@ -1248,10 +1243,9 @@
 	nr_create
 };
 
-static struct proto_ops nr_proto_ops = {
+static struct proto_ops SOCKOPS_WRAPPED(nr_proto_ops) = {
 	PF_NETROM,
 
-	sock_no_dup,
 	nr_release,
 	nr_bind,
 	nr_connect,
@@ -1266,8 +1260,12 @@
 	nr_getsockopt,
 	sock_no_fcntl,
 	nr_sendmsg,
-	nr_recvmsg
+	nr_recvmsg,
+	sock_no_mmap
 };
+
+#include <linux/smp_lock.h>
+SOCKOPS_WRAP(nr_proto, PF_NETROM);
 
 static struct notifier_block nr_dev_notifier = {
 	nr_device_event,