Skip to content
Commit 439ccd8c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-IPIP-cleanups'



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: default avatarDavid S. Miller <davem@davemloft.net>
parents d75de7b6 e437f3b6
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment