Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8897207c authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum_ipip: Support decoding IPv6 tunnel addresses 



To support mirroring to ip6gretap, the SPAN module needs to be able to
decode IPv6 addresses specified at that tunnel.

Extend mlxsw_sp_ipip_netdev_saddr() and mlxsw_sp_ipip_netdev_daddr() to
support IPv6 addresses. To that end, add and publish a support function
mlxsw_sp_ipip_netdev_parms6().

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7e58a6c6

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

+27 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
 */



#include <net/ip_tunnels.h>

#include <net/ip6_tunnel.h>



#include "spectrum_ipip.h"
@@ -44,6 +45,14 @@ mlxsw_sp_ipip_netdev_parms4(const struct net_device *ol_dev) 
	return tun->parms;

}



struct __ip6_tnl_parm

mlxsw_sp_ipip_netdev_parms6(const struct net_device *ol_dev)

{

	struct ip6_tnl *tun = netdev_priv(ol_dev);



	return tun->parms;

}



static bool mlxsw_sp_ipip_parms4_has_ikey(struct ip_tunnel_parm parms)

{

	return !!(parms.i_flags & TUNNEL_KEY);
@@ -72,24 +81,38 @@ mlxsw_sp_ipip_parms4_saddr(struct ip_tunnel_parm parms) 
	return (union mlxsw_sp_l3addr) { .addr4 = parms.iph.saddr };

}



static union mlxsw_sp_l3addr

mlxsw_sp_ipip_parms6_saddr(struct __ip6_tnl_parm parms)

{

	return (union mlxsw_sp_l3addr) { .addr6 = parms.laddr };

}



static union mlxsw_sp_l3addr

mlxsw_sp_ipip_parms4_daddr(struct ip_tunnel_parm parms)

{

	return (union mlxsw_sp_l3addr) { .addr4 = parms.iph.daddr };

}



static union mlxsw_sp_l3addr

mlxsw_sp_ipip_parms6_daddr(struct __ip6_tnl_parm parms)

{

	return (union mlxsw_sp_l3addr) { .addr6 = parms.raddr };

}



union mlxsw_sp_l3addr

mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,

			   const struct net_device *ol_dev)

{

	struct ip_tunnel_parm parms4;

	struct __ip6_tnl_parm parms6;



	switch (proto) {

	case MLXSW_SP_L3_PROTO_IPV4:

		parms4 = mlxsw_sp_ipip_netdev_parms4(ol_dev);

		return mlxsw_sp_ipip_parms4_saddr(parms4);

	case MLXSW_SP_L3_PROTO_IPV6:

		break;

		parms6 = mlxsw_sp_ipip_netdev_parms6(ol_dev);

		return mlxsw_sp_ipip_parms6_saddr(parms6);

	}



	WARN_ON(1);
@@ -109,13 +132,15 @@ mlxsw_sp_ipip_netdev_daddr(enum mlxsw_sp_l3proto proto, 
			   const struct net_device *ol_dev)

{

	struct ip_tunnel_parm parms4;

	struct __ip6_tnl_parm parms6;



	switch (proto) {

	case MLXSW_SP_L3_PROTO_IPV4:

		parms4 = mlxsw_sp_ipip_netdev_parms4(ol_dev);

		return mlxsw_sp_ipip_parms4_daddr(parms4);

	case MLXSW_SP_L3_PROTO_IPV6:

		break;

		parms6 = mlxsw_sp_ipip_netdev_parms6(ol_dev);

		return mlxsw_sp_ipip_parms6_daddr(parms6);

	}



	WARN_ON(1);

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

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 


struct ip_tunnel_parm

mlxsw_sp_ipip_netdev_parms4(const struct net_device *ol_dev);

struct __ip6_tnl_parm

mlxsw_sp_ipip_netdev_parms6(const struct net_device *ol_dev);



union mlxsw_sp_l3addr

mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,