diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-13 15:28:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-13 15:28:10 -0800 |
| commit | 69eebed240b32377b9034551f1b8c4ae2774ceb6 (patch) | |
| tree | 6955dbf8110c6f03d64747fe55e1feb1d81e951f /net/ipv6/esp6.c | |
| parent | 67daf5f11f06b9b15f8320de1d237ccc2e74fe43 (diff) | |
| parent | dca80b962a811a0454d779ab6250b59446a8c86c (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/esp6.c')
| -rw-r--r-- | net/ipv6/esp6.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 6de8ee1a5ad..7b5b94f1390 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -266,8 +266,7 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET6); if (!x) return; - printk(KERN_DEBUG "pmtu discovery on SA ESP/%08x/" - "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", + printk(KERN_DEBUG "pmtu discovery on SA ESP/%08x/" NIP6_FMT "\n", ntohl(esph->spi), NIP6(iph->daddr)); xfrm_state_put(x); } |