Merge branch 'udp-tunnel-common'

Browse source

Andy Zhou says:

====================
Refactor vxlan and l2tp to use new common UDP tunnel APIs

This patch series add a few more UDP tunnel APIs and refactoring current
UDP tunnel based protocols, vxlan and l2tp to make use of the new APIs.

The added APIs are setup_udp_tunnel_sock(), udp_tunnel_xmit_skb() and
udp_tunnel_sock_release(). Those implementation logics already exist in
current vxlan and l2tp implementation. Move them to common APIs to reduce
code duplications.

Also split udp_tunnel.c into net/ipv4/udp_tunnel.c and
net/ipv6/ip6_udp_tunnel.c to maintain proper IP protocol separation.
====================

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

...

This commit is contained in:

David S. Miller 2014-09-19 15:57:46 -04:00

parent 79ba2b4c5d c8fffcea0a

commit 3ff6425961

6 changed files with 294 additions and 164 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

105

drivers/net/vxlan.c

View file

85

include/net/udp_tunnel.h

View file

138

net/ipv4/udp_tunnel.c

View file

1

net/ipv6/Makefile

View file

105

net/ipv6/ip6_udp_tunnel.c

View file

24

net/l2tp/l2tp_core.c

View file