X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fnet%2Fip.h;fp=include%2Fnet%2Fip.h;h=ed84d0456d4cc00e8ef09898cd878e3662b49211;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=98f90840077186243bf910db40452ba7cfa881d9;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/include/net/ip.h b/include/net/ip.h
index 98f908400..ed84d0456 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -22,6 +22,7 @@
 #ifndef _IP_H
 #define _IP_H
 
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/ip.h>
 #include <linux/in.h>
@@ -146,6 +147,7 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *ar
 struct ipv4_config
 {
 	int	log_martians;
+	int	autoconfig;
 	int	no_pmtu_disc;
 };
 
@@ -355,10 +357,6 @@ extern void	ip_cmsg_recv(struct msghdr *msg, struct sk_buff *skb);
 extern int	ip_cmsg_send(struct msghdr *msg, struct ipcm_cookie *ipc);
 extern int	ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval, int optlen);
 extern int	ip_getsockopt(struct sock *sk, int level, int optname, char __user *optval, int __user *optlen);
-extern int	compat_ip_setsockopt(struct sock *sk, int level,
-			int optname, char __user *optval, int optlen);
-extern int	compat_ip_getsockopt(struct sock *sk, int level,
-			int optname, char __user *optval, int __user *optlen);
 extern int	ip_ra_control(struct sock *sk, unsigned char on, void (*destructor)(struct sock *));
 
 extern int 	ip_recv_error(struct sock *sk, struct msghdr *msg, int len);