patch-2.1.42 linux/net/x25/x25_route.c

Next file: linux/net/x25/x25_subr.c
Previous file: linux/net/x25/x25_link.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.41/linux/net/x25/x25_route.c linux/net/x25/x25_route.c
@@ -59,7 +59,7 @@
 		if (memcmp(&x25_route->address, address, sigdigits) == 0 && x25_route->sigdigits == sigdigits)
 			return -EINVAL;
 
-	if ((x25_route = (struct x25_route *)kmalloc(sizeof(*x25_route), GFP_ATOMIC)) == NULL)
+	if ((x25_route = kmalloc(sizeof(*x25_route), GFP_ATOMIC)) == NULL)
 		return -ENOMEM;
 
 	strcpy(x25_route->address.x25_addr, "000000000000000");
@@ -87,7 +87,7 @@
 	if ((s = x25_route_list) == x25_route) {
 		x25_route_list = x25_route->next;
 		restore_flags(flags);
-		kfree_s(x25_route, sizeof(struct x25_route));
+		kfree(x25_route);
 		return;
 	}
 
@@ -95,7 +95,7 @@
 		if (s->next == x25_route) {
 			s->next = x25_route->next;
 			restore_flags(flags);
-			kfree_s(x25_route, sizeof(struct x25_route));
+			kfree(x25_route);
 			return;
 		}
 

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