net: Remove __KERNEL__ cpp checks from include/net

[cascardo/linux.git] / include / net / addrconf.h

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 23710aa..582e4ae 100644 (file)
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -42,8 +42,6 @@ struct prefix_info {
 };
 
 
-#ifdef __KERNEL__
-
 #include <linux/netdevice.h>
 #include <net/if_inet6.h>
 #include <net/ipv6.h>
@@ -61,16 +59,16 @@ extern int                  addrconf_set_dstaddr(struct net *net,
                                                     void __user *arg);
 
 extern int                     ipv6_chk_addr(struct net *net,
-                                             struct in6_addr *addr,
+                                             const struct in6_addr *addr,
                                              struct net_device *dev,
                                              int strict);
 
 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
 extern int                     ipv6_chk_home_addr(struct net *net,
-                                                  struct in6_addr *addr);
+                                                  const struct in6_addr *addr);
 #endif
 
-extern int                     ipv6_chk_prefix(struct in6_addr *addr,
+extern int                     ipv6_chk_prefix(const struct in6_addr *addr,
                                                struct net_device *dev);
 
 extern struct inet6_ifaddr      *ipv6_get_ifaddr(struct net *net,
@@ -89,9 +87,9 @@ extern int                    ipv6_get_lladdr(struct net_device *dev,
 extern int                     ipv6_rcv_saddr_equal(const struct sock *sk,
                                                    const struct sock *sk2);
 extern void                    addrconf_join_solict(struct net_device *dev,
-                                       struct in6_addr *addr);
+                                       const struct in6_addr *addr);
 extern void                    addrconf_leave_solict(struct inet6_dev *idev,
-                                       struct in6_addr *addr);
+                                       const struct in6_addr *addr);
 
 static inline unsigned long addrconf_timeout_fixup(u32 timeout,
                                                    unsigned unit)
@@ -158,15 +156,15 @@ extern void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len);
 /*
  *     anycast prototypes (anycast.c)
  */
-extern int ipv6_sock_ac_join(struct sock *sk,int ifindex,struct in6_addr *addr);
-extern int ipv6_sock_ac_drop(struct sock *sk,int ifindex,struct in6_addr *addr);
+extern int ipv6_sock_ac_join(struct sock *sk,int ifindex, const struct in6_addr *addr);
+extern int ipv6_sock_ac_drop(struct sock *sk,int ifindex, const struct in6_addr *addr);
 extern void ipv6_sock_ac_close(struct sock *sk);
-extern int inet6_ac_check(struct sock *sk, struct in6_addr *addr, int ifindex);
+extern int inet6_ac_check(struct sock *sk, const struct in6_addr *addr, int ifindex);
 
-extern int ipv6_dev_ac_inc(struct net_device *dev, struct in6_addr *addr);
-extern int __ipv6_dev_ac_dec(struct inet6_dev *idev, struct in6_addr *addr);
+extern int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr);
+extern int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr);
 extern int ipv6_chk_acast_addr(struct net *net, struct net_device *dev,
-                              struct in6_addr *addr);
+                              const struct in6_addr *addr);
 
 
 /* Device notifier */
@@ -285,4 +283,3 @@ extern void if6_proc_exit(void);
 #endif
 
 #endif
-#endif