diff options
| author | James Morris <jmorris@namei.org> | 2009-06-30 01:10:35 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-30 01:10:35 +0200 |
| commit | ac7242142b03421c96b0a2f8d99f146d075614c2 (patch) | |
| tree | b0b2ead65858c7a343d38affed86fe815e37e7e9 /net/ipv6/tunnel6.c | |
| parent | selinux: clean up avc node cache when disabling selinux (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff) | |
| download | linux-ac7242142b03421c96b0a2f8d99f146d075614c2.tar.xz linux-ac7242142b03421c96b0a2f8d99f146d075614c2.zip | |
Merge branch 'master' into next
Diffstat (limited to 'net/ipv6/tunnel6.c')
| -rw-r--r-- | net/ipv6/tunnel6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tunnel6.c b/net/ipv6/tunnel6.c index 669f280989c3..633ad789effc 100644 --- a/net/ipv6/tunnel6.c +++ b/net/ipv6/tunnel6.c @@ -124,7 +124,7 @@ drop: } static void tunnel6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, - int type, int code, int offset, __be32 info) + u8 type, u8 code, int offset, __be32 info) { struct xfrm6_tunnel *handler; |