diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 12:44:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 12:44:11 -0400 |
commit | 77a50df2b14c8d3ee3c58c21c4a0e0157570df09 (patch) | |
tree | 0e324a712e5e768c8353b0b5ba6ddc31095479f0 /net/xfrm/xfrm_state.c | |
parent | 96fffeb4b413a4f8f65bb627d59b7dfc97ea0b39 (diff) | |
parent | 358c12953b88c5a06a57c33eb27c753b2e7934d1 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
iwlwifi: Allow building iwl3945 without iwl4965.
wireless: Fix compile error with wifi & leds
tcp: Fix slab corruption with ipv6 and tcp6fuzz
ipv4/ipv6 compat: Fix SSM applications on 64bit kernels.
[IPSEC]: Use digest_null directly for auth
sunrpc: fix missing kernel-doc
can: Fix copy_from_user() results interpretation
Revert "ipv6: Fix typo in net/ipv6/Kconfig"
tipc: endianness annotations
ipv6: result of csum_fold() is already 16bit, no need to cast
[XFRM] AUDIT: Fix flowlabel text format ambibuity.
Diffstat (limited to 'net/xfrm/xfrm_state.c')
-rw-r--r-- | net/xfrm/xfrm_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 5dcc10b93c86..fac27ce770d5 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
@@ -2112,7 +2112,7 @@ static void xfrm_audit_helper_pktinfo(struct sk_buff *skb, u16 family, | |||
2112 | iph6 = ipv6_hdr(skb); | 2112 | iph6 = ipv6_hdr(skb); |
2113 | audit_log_format(audit_buf, | 2113 | audit_log_format(audit_buf, |
2114 | " src=" NIP6_FMT " dst=" NIP6_FMT | 2114 | " src=" NIP6_FMT " dst=" NIP6_FMT |
2115 | " flowlbl=0x%x%x%x", | 2115 | " flowlbl=0x%x%02x%02x", |
2116 | NIP6(iph6->saddr), | 2116 | NIP6(iph6->saddr), |
2117 | NIP6(iph6->daddr), | 2117 | NIP6(iph6->daddr), |
2118 | iph6->flow_lbl[0] & 0x0f, | 2118 | iph6->flow_lbl[0] & 0x0f, |