diff options
Diffstat (limited to 'net/ipv6/xfrm6_tunnel.c')
| -rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index da09ff258648..8cfc58b96fc2 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c | |||
| @@ -259,8 +259,7 @@ try_next_2:; | |||
| 259 | spi = 0; | 259 | spi = 0; |
| 260 | goto out; | 260 | goto out; |
| 261 | alloc_spi: | 261 | alloc_spi: |
| 262 | X6TPRINTK3(KERN_DEBUG "%s(): allocate new spi for " | 262 | X6TPRINTK3(KERN_DEBUG "%s(): allocate new spi for " NIP6_FMT "\n", |
| 263 | "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", | ||
| 264 | __FUNCTION__, | 263 | __FUNCTION__, |
| 265 | NIP6(*(struct in6_addr *)saddr)); | 264 | NIP6(*(struct in6_addr *)saddr)); |
| 266 | x6spi = kmem_cache_alloc(xfrm6_tunnel_spi_kmem, SLAB_ATOMIC); | 265 | x6spi = kmem_cache_alloc(xfrm6_tunnel_spi_kmem, SLAB_ATOMIC); |
| @@ -323,9 +322,8 @@ void xfrm6_tunnel_free_spi(xfrm_address_t *saddr) | |||
| 323 | list_byaddr) | 322 | list_byaddr) |
| 324 | { | 323 | { |
| 325 | if (memcmp(&x6spi->addr, saddr, sizeof(x6spi->addr)) == 0) { | 324 | if (memcmp(&x6spi->addr, saddr, sizeof(x6spi->addr)) == 0) { |
| 326 | X6TPRINTK3(KERN_DEBUG "%s(): x6spi object " | 325 | X6TPRINTK3(KERN_DEBUG "%s(): x6spi object for " NIP6_FMT |
| 327 | "for %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x " | 326 | " found at %p\n", |
| 328 | "found at %p\n", | ||
| 329 | __FUNCTION__, | 327 | __FUNCTION__, |
| 330 | NIP6(*(struct in6_addr *)saddr), | 328 | NIP6(*(struct in6_addr *)saddr), |
| 331 | x6spi); | 329 | x6spi); |
