X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fnet%2Froute.h;h=7252ea43e835fcb4d45ef7821a79544cc1395013;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=cabc344999bd94b566b163310c057fa118fb2286;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/include/net/route.h b/include/net/route.h
index cabc34499..7252ea43e 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -132,7 +132,7 @@ extern void		ip_rt_send_redirect(struct sk_buff *skb);
 
 extern unsigned		inet_addr_type(u32 addr);
 extern void		ip_rt_multicast_event(struct in_device *);
-extern int		ip_rt_ioctl(unsigned int cmd, void *arg);
+extern int		ip_rt_ioctl(unsigned int cmd, void __user *arg);
 extern void		ip_rt_get_source(u8 *src, struct rtable *rt);
 extern int		ip_rt_dump(struct sk_buff *skb,  struct netlink_callback *cb);
 
@@ -222,7 +222,8 @@ static inline int ip_route_connect(struct rtable **rp, u32 dst,
 
 	if (sk)
 		nx_info = sk->sk_nx_info;
-	vxdprintk("ip_route_connect(%p) %p,%p;%lx\n",
+	vxdprintk(VXD_CBIT(net, 4),
+		"ip_route_connect(%p) %p,%p;%lx",
 		sk, nx_info, sk->sk_socket,
 		(sk->sk_socket?sk->sk_socket->flags:0));