]> err.no Git - linux-2.6/commit
[IPSEC]: Rename tunnel-mode functions to avoid collisions with tunnels
authorHerbert Xu <herbert@gondor.apana.org.au>
Thu, 20 Dec 2007 21:53:40 +0000 (13:53 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 22:59:18 +0000 (14:59 -0800)
commit195ad6a3ac8b5c4eef4916efcb673e96e6f09d89
treee4b2eda2f01c898518b328e949444cf7c11d776e
parentad01837593338f13508463fa11c8dbf8109a1e5d
[IPSEC]: Rename tunnel-mode functions to avoid collisions with tunnels

It appears that I've managed to create two different functions both
called xfrm6_tunnel_output.  This is because we have the plain tunnel
encapsulation named xfrmX_tunnel as well as the tunnel-mode encapsulation
which lives in the files xfrmX_mode_tunnel.c.

This patch renames functions from the latter to use the xfrmX_mode_tunnel
prefix to avoid name-space conflicts.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/xfrm4_mode_tunnel.c
net/ipv6/xfrm6_mode_tunnel.c