patch-1.3.82 linux/net/appletalk/ddp.c

Next file: linux/net/appletalk/sysctl_net_atalk.c
Previous file: linux/net/appletalk/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.81/linux/net/appletalk/ddp.c linux/net/appletalk/ddp.c
@@ -219,7 +219,7 @@
 	
 	if(sk->wmem_alloc == 0 && sk->rmem_alloc == 0 && sk->dead)
 	{
-		kfree_s(sk,sizeof(*sk));
+		sk_free(sk);
 		MOD_DEC_USE_COUNT;
 	}
 	else
@@ -1125,7 +1125,7 @@
 static int atalk_create(struct socket *sock, int protocol)
 {
 	atalk_socket *sk;
-	sk=(atalk_socket *)kmalloc(sizeof(*sk),GFP_KERNEL);
+	sk=(atalk_socket *)sk_alloc(GFP_KERNEL);
 	if(sk==NULL)
 		return(-ENOMEM);
 	switch(sock->type)
@@ -1137,7 +1137,7 @@
 		case SOCK_DGRAM:
 			break;
 		default:
-			kfree_s((void *)sk,sizeof(*sk));
+			sk_free((void *)sk);
 			return(-ESOCKTNOSUPPORT);
 	}
 
@@ -1364,7 +1364,7 @@
 static int atalk_accept(struct socket *sock, struct socket *newsock, int flags)
 {
 	if(newsock->data)
-		kfree_s(newsock->data,sizeof(atalk_socket));
+		sk_free(newsock->data);
 	return -EOPNOTSUPP;
 }
 
@@ -2064,7 +2064,7 @@
 		atalk_if_get_info
 	});
 
-	printk("Appletalk 0.17 for Linux NET3.034\n");
+	printk(KERN_INFO "Appletalk 0.17 for Linux NET3.034\n");
 }
 
 #ifdef MODULE

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