diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-02-13 12:24:28 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-13 12:24:28 -0500 |
| commit | 439ccd8ce9eeb4c44632404a0ba38f947e97caba (patch) | |
| tree | 6f0d9db02b826a665e7567fd192e47b118aa88a1 /include/linux | |
| parent | dpaa_eth: fix incorrect comment (diff) | |
| parent | mlxsw: spectrum: Distinguish between IPv4/6 tunnels (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>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions