Merge branch 'ip_tunnel-next'

Browse source

wenxu says:

====================
ip_tunnel: Refactor ip_gre collect metadata xmit to ip_md_tunnel_xmit

This patchset add tunnel_dst_cache and tnl_update_pmtu feature for
ip_md_tunnel_xmit also bugfix. Then Refactor collect metatdata mode
tunnel xmit to ip_md_tunnel_xmit
====================

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

...

This commit is contained in:

David S. Miller 2019-01-26 09:43:03 -08:00

parent 662a14d0c7 962924fa2b

commit a4b8299493

4 changed files with 66 additions and 112 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

2

include/net/ip_tunnels.h

View file

112

net/ipv4/ip_gre.c

View file

62

net/ipv4/ip_tunnel.c

View file

2

net/ipv4/ipip.c

View file