OSDN Git Service

Merge branch 'mlxsw-IPIP-cleanups'
authorDavid S. Miller <davem@davemloft.net>
Tue, 13 Feb 2018 17:24:28 +0000 (12:24 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Feb 2018 17:24:28 +0000 (12:24 -0500)
Jiri Pirko says:

====================
mlxsw: IPIP cleanups

In the first patch, a forgotten #include is added. Even though the code
compiles as-is, the include is necessary for modules that should include
spectrum_ipip.h.

The second patch corrects an assumption that IPv6 tunnels use struct
ip_tunnel_parm to store tunnel parameters.
====================

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

Trivial merge