From: David S. Miller <davem@davemloft.net>
Date: Tue, 13 Feb 2018 17:24:28 +0000 (-0500)
Subject: Merge branch 'mlxsw-IPIP-cleanups'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=439ccd8ce9eeb4c44632404a0ba38f947e97caba;p=linux.git

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: David S. Miller <davem@davemloft.net>
---

439ccd8ce9eeb4c44632404a0ba38f947e97caba