mlxsw: spectrum: Distinguish between IPv4/6 tunnels

Browse source

struct ip_tunnel_parm, where GRE and several other tunnel types hold
information, is IPv4-specific. The current router / ipip code in mlxsw
however uses it as if it were generic.

Make it clear that it's not. Rename many functions from _params_ to
_params4_. mlxsw_sp_ipip_parms_saddr() and _daddr() take a proto
argument to dispatch on it. Move the dispatch logic to
mlxsw_sp_ipip_netdev_saddr() and _daddr(), and replace with
single-protocol functions.

In struct mlxsw_sp_ipip_entry, move the "parms" field to a (for the time
being, singleton) union. Update users throughout.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

Petr Machata 2018-02-13 11:26:09 +01:00 • committed by David S. Miller

parent fe735a3d2c

commit e437f3b62d

3 changed files with 72 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

6

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

View file

16

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

View file