Pull sgi into release branch

[mv-sheeva.git] / include / net / rawv6.h

diff --git a/include/net/rawv6.h b/include/net/rawv6.h
index 887009aa1f8872e20e2dc393950e48947fb53a8b..af8960878ef41c72df5238a2304fc6bca643ef94 100644 (file)
--- a/include/net/rawv6.h
+++ b/include/net/rawv6.h
@@ -7,7 +7,7 @@
 extern struct hlist_head raw_v6_htable[RAWV6_HTABLE_SIZE];
 extern rwlock_t raw_v6_lock;
 
-extern void ipv6_raw_deliver(struct sk_buff *skb, int nexthdr);
+extern int ipv6_raw_deliver(struct sk_buff *skb, int nexthdr);
 
 extern struct sock *__raw_v6_lookup(struct sock *sk, unsigned short num,
                                    struct in6_addr *loc_addr, struct in6_addr *rmt_addr,
@@ -21,7 +21,7 @@ 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);
 
 #endif