diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-22 16:33:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-22 16:33:00 -0700 |
| commit | 38afd6adf6bccd7176e88c07cac104d3639aa30d (patch) | |
| tree | 2142409984b609e51ef60b6a14318dd4e878718a /include/net/xfrm.h | |
| parent | 8ed1383fb7b6685968588141d5934e0e6715e954 (diff) | |
| parent | 261688d01ec07d3a265b8ace6ec68310fbd96a96 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/xfrm.h')
| -rw-r--r-- | include/net/xfrm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 029522a4ced..868ef88ef97 100644 --- 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 { |