Merge branch 'mlxsw-IPIP-cleanups'

Browse source

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>

...

This commit is contained in:

David S. Miller 2018-02-13 12:24:28 -05:00

parent d75de7b6e7 e437f3b62d

commit 439ccd8ce9

3 changed files with 73 additions and 91 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

153

drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c

View file

7

drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h

View file

16

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

View file