[INET]: Remove struct net_proto_family* from _init calls.

[net-next-2.6.git] / include / net / ndisc.h

diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index d3915dabe6de1807a909b309233ec8e0e3b68885..5aedf324de6699c91d88b2351f527255f16a3284 100644 (file)
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -24,6 +24,7 @@ enum {
        ND_OPT_MTU = 5,                 /* RFC2461 */
        __ND_OPT_ARRAY_MAX,
        ND_OPT_ROUTE_INFO = 24,         /* RFC4191 */
+       ND_OPT_RDNSS = 25,              /* RFC5006 */
        __ND_OPT_MAX
 };
 
@@ -66,8 +67,8 @@ struct rs_msg {
 
 struct ra_msg {
         struct icmp6hdr                icmph;
-       __u32                   reachable_time;
-       __u32                   retrans_timer;
+       __be32                  reachable_time;
+       __be32                  retrans_timer;
 };
 
 struct nd_opt_hdr {
@@ -76,7 +77,7 @@ struct nd_opt_hdr {
 } __attribute__((__packed__));
 
 
-extern int                     ndisc_init(struct net_proto_family *ops);
+extern int                     ndisc_init(void);
 
 extern void                    ndisc_cleanup(void);
 
@@ -102,12 +103,11 @@ extern void                       ndisc_send_redirect(struct sk_buff *skb,
 extern int                     ndisc_mc_map(struct in6_addr *addr, char *buf, struct net_device *dev, int dir);
 
 
-struct rt6_info *              dflt_rt_lookup(void);
 
 /*
  *     IGMP
  */
-extern int                     igmp6_init(struct net_proto_family *ops);
+extern int                     igmp6_init(void);
 
 extern void                    igmp6_cleanup(void);