]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6b1c41a e6f1724)
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)
commitb51214f47c4d001775e4624bfe5d2c765dea4141
tree6f0d9db02b826a665e7567fd192e47b118aa88a1tree | snapshot
parent6b1c41a449fb52c8d836ad218e5091de51efb2e7commit | diff
parente6f1724ad2d37f080020515a4fd153a59aefa79acommit | 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>
Linux Kernel Source Tree.