| commit | 439ccd8ce9eeb4c44632404a0ba38f947e97caba | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Feb 13 12:24:28 2018 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Tue Feb 13 12:24:28 2018 -0500 |
| tree | 6f0d9db02b826a665e7567fd192e47b118aa88a1 | |
| parent | d75de7b6e737148863705f3523f9575d10429815 [diff] | |
| parent | e437f3b62d0844c4073c9e13263413748fa69093 [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>