]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'tunnels'
authorDavid S. Miller <davem@davemloft.net>
Tue, 26 Mar 2013 16:27:27 +0000 (12:27 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Mar 2013 16:27:27 +0000 (12:27 -0400)
commitbd5dca06c74eb8dfe37550b52585bd5316fc5918
tree8487c6d6f12951178a093c95bf72d6a7915884c6
parentcce8bfa22ee6ebc14dc4b9b7cee1c8ed81bc6f24
parentd1c1cfedd7dfdf1405ac346085b84280cf3b0f8a
Merge branch 'tunnels'

Pravin B Shelar says:

====================
Following patch series restructure GRE and IPIP tunneling code
to make it modular. It adds ip_tunnel module which acts as
generic tunneling layer which has common code.

These patches do not change any functionality.
v3:v4:
 - Fixed compilation error in ipv6.
 - Few coding style fixes.
v2-v3:
 - Use GPL exports for all export symbols.
 - Set default config NET_IP_TUNNEL to m.
v1-v2:
 - Dropped patch to convert gre_proto_lock to rtnl lock.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>