Merge git://git.infradead.org/battery-2.6

[~andy/linux] / include / net / ndisc.h

diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index e0e594f8e9d9aadcf4949019bacad741ff04a2ab..62beeb97c4b16ac569165882440b820edf61ca29 100644 (file)
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -42,8 +42,6 @@ enum {
 #define ND_REACHABLE_TIME              (30*HZ)
 #define ND_RETRANS_TIMER               HZ
 
-#ifdef __KERNEL__
-
 #include <linux/compiler.h>
 #include <linux/icmpv6.h>
 #include <linux/in6.h>
@@ -102,7 +100,8 @@ extern void                 ndisc_send_redirect(struct sk_buff *skb,
                                                    struct neighbour *neigh,
                                                    const struct in6_addr *target);
 
-extern int                     ndisc_mc_map(struct in6_addr *addr, char *buf, struct net_device *dev, int dir);
+extern int                     ndisc_mc_map(const struct in6_addr *addr, char *buf,
+                                            struct net_device *dev, int dir);
 
 extern struct sk_buff          *ndisc_build_skb(struct net_device *dev,
                                                 const struct in6_addr *daddr,
@@ -155,8 +154,4 @@ static inline struct neighbour * ndisc_get_neigh(struct net_device *dev, const s
        return ERR_PTR(-ENODEV);
 }
 
-
-#endif /* __KERNEL__ */
-
-
 #endif