Merge HEAD from /spare/repo/linux-2.6/.git

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

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 029522a4cedab6c3f5ef61f56ce61cb5fe4714e4..a9d0d8c5dfbffa04c1ca67ccb35e464940301833 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -803,7 +803,7 @@ struct xfrm_algo_desc {
 /* XFRM tunnel handlers.  */
 struct xfrm_tunnel {
        int (*handler)(struct sk_buff *skb);
-       void (*err_handler)(struct sk_buff *skb, void *info);
+       void (*err_handler)(struct sk_buff *skb, __u32 info);
 };
 
 struct xfrm6_tunnel {
@@ -818,7 +818,6 @@ extern void xfrm6_init(void);
 extern void xfrm6_fini(void);
 extern void xfrm_state_init(void);
 extern void xfrm4_state_init(void);
-extern void xfrm4_state_fini(void);
 extern void xfrm6_state_init(void);
 extern void xfrm6_state_fini(void);