Merge branches 'core/softlockup', 'core/softirq', 'core/resources', 'core/printk...

[pandora-kernel.git] / include / linux / icmpv6.h

diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h
index 68d3526..0306744 100644 (file)
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
@@ -75,6 +75,15 @@ struct icmp6hdr {
 #define icmp6_router_pref      icmp6_dataun.u_nd_ra.router_pref
 };
 
+#ifdef __KERNEL__
+#include <linux/skbuff.h>
+
+static inline struct icmp6hdr *icmp6_hdr(const struct sk_buff *skb)
+{
+       return (struct icmp6hdr *)skb_transport_header(skb);
+}
+#endif
+
 #define ICMPV6_ROUTER_PREF_LOW         0x3
 #define ICMPV6_ROUTER_PREF_MEDIUM      0x0
 #define ICMPV6_ROUTER_PREF_HIGH                0x1
@@ -167,12 +176,21 @@ extern void                               icmpv6_send(struct sk_buff *skb,
                                                    __u32 info, 
                                                    struct net_device *dev);
 
-extern int                             icmpv6_init(struct net_proto_family *ops);
+extern int                             icmpv6_init(void);
 extern int                             icmpv6_err_convert(int type, int code,
                                                           int *err);
 extern void                            icmpv6_cleanup(void);
 extern void                            icmpv6_param_prob(struct sk_buff *skb,
                                                          int code, int pos);
+
+struct flowi;
+struct in6_addr;
+extern void                            icmpv6_flow_init(struct sock *sk,
+                                                        struct flowi *fl,
+                                                        u8 type,
+                                                        const struct in6_addr *saddr,
+                                                        const struct in6_addr *daddr,
+                                                        int oif);
 #endif
 
 #endif