diff options
author | David S. Miller <davem@davemloft.net> | 2013-03-26 12:27:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-26 12:27:27 -0400 |
commit | dbbd136c7dbfe0fba989f337c35f976ef432d1d5 (patch) | |
tree | 8487c6d6f12951178a093c95bf72d6a7915884c6 /drivers/Makefile | |
parent | eaac5f3d3ad33547b299935e6db0cfc7be9a576a (diff) | |
parent | f61dd388a9b76f273bb0de9786600fd64e34ba09 (diff) |
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>
Diffstat (limited to 'drivers/Makefile')
0 files changed, 0 insertions, 0 deletions