projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d75de7b e437f3b)
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)
commit439ccd8ce9eeb4c44632404a0ba38f947e97caba
tree6f0d9db02b826a665e7567fd192e47b118aa88a1tree | snapshot
parentd75de7b6e737148863705f3523f9575d10429815commit | diff
parente437f3b62d0844c4073c9e13263413748fa69093commit | diff
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>
John Crispins staging tree