Pull video into release branch

[linux-2.6-omap-h63xx.git] / include / net / rawv6.h

diff --git a/include/net/rawv6.h b/include/net/rawv6.h
index 14476a71725e56467fe934611d3ec2f7e659abb6..a5819891d52518a25b8430ba1f90cdad6ab0b403 100644 (file)
--- a/include/net/rawv6.h
+++ b/include/net/rawv6.h
@@ -3,6 +3,8 @@
 
 #ifdef __KERNEL__
 
+#include <net/protocol.h>
+
 #define RAWV6_HTABLE_SIZE      MAX_INET_PROTOS
 extern struct hlist_head raw_v6_htable[RAWV6_HTABLE_SIZE];
 extern rwlock_t raw_v6_lock;
@@ -21,7 +23,14 @@ extern void                  rawv6_err(struct sock *sk,
                                          struct sk_buff *skb,
                                          struct inet6_skb_parm *opt,
                                          int type, int code, 
-                                         int offset, u32 info);
+                                         int offset, __be32 info);
+
+#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
+int rawv6_mh_filter_register(int (*filter)(struct sock *sock,
+                                          struct sk_buff *skb));
+int rawv6_mh_filter_unregister(int (*filter)(struct sock *sock,
+                                            struct sk_buff *skb));
+#endif
 
 #endif