diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-05-27 23:48:16 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-31 17:19:05 -0700 |
| commit | 32b8a8e59c9c8fa56051d6e9ab2924e469ac4d92 (patch) | |
| tree | 51ee4bd6009be21d7aab90212f34e1f4f9e46f7f /net/ipv4/xfrm4_tunnel.c | |
| parent | bf3d6a8f791b2a81279b9ce3201b4970f6fbe51a (diff) | |
| download | linux-32b8a8e59c9c8fa56051d6e9ab2924e469ac4d92.tar.gz linux-32b8a8e59c9c8fa56051d6e9ab2924e469ac4d92.tar.bz2 linux-32b8a8e59c9c8fa56051d6e9ab2924e469ac4d92.zip | |
sit: add IPv4 over IPv4 support
This patch adds the support of IPv4 over Ipv4 for the module sit. The gain of
this feature is to be able to have 4in4 and 6in4 over the same interface
instead of having one interface for 6in4 and another for 4in4 even if
encapsulation addresses are the same.
To avoid conflicting with ipip module, sit IPv4 over IPv4 protocol is
registered with a smaller priority.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_tunnel.c')
| -rw-r--r-- | net/ipv4/xfrm4_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_tunnel.c b/net/ipv4/xfrm4_tunnel.c index 05a5df2febc9..06347dbd32c1 100644 --- a/net/ipv4/xfrm4_tunnel.c +++ b/net/ipv4/xfrm4_tunnel.c @@ -63,7 +63,7 @@ static int xfrm_tunnel_err(struct sk_buff *skb, u32 info) static struct xfrm_tunnel xfrm_tunnel_handler __read_mostly = { .handler = xfrm_tunnel_rcv, .err_handler = xfrm_tunnel_err, - .priority = 2, + .priority = 3, }; #if IS_ENABLED(CONFIG_IPV6) |