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

Commit 474f0ff6 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum: Move mlxsw_sp_ipip_netdev_{s, d}addr{, 4}() 



These functions ideologically belong to the IPIP module, and some
follow-up work will benefit from their presence there.

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 cafdb2a0

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

+53 −0
Original line number Diff line number Diff line
@@ -68,6 +68,59 @@ static u32 mlxsw_sp_ipip_netdev_okey(const struct net_device *ol_dev) 
		be32_to_cpu(tun->parms.o_key) : 0;

}



static __be32

mlxsw_sp_ipip_netdev_saddr4(const struct net_device *ol_dev)

{

	struct ip_tunnel *tun = netdev_priv(ol_dev);



	return tun->parms.iph.saddr;

}



union mlxsw_sp_l3addr

mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,

			   const struct net_device *ol_dev)

{

	switch (proto) {

	case MLXSW_SP_L3_PROTO_IPV4:

		return (union mlxsw_sp_l3addr) {

			.addr4 = mlxsw_sp_ipip_netdev_saddr4(ol_dev),

		};

	case MLXSW_SP_L3_PROTO_IPV6:

		break;

	}



	WARN_ON(1);

	return (union mlxsw_sp_l3addr) {

		.addr4 = 0,

	};

}



static __be32 mlxsw_sp_ipip_netdev_daddr4(const struct net_device *ol_dev)

{

	struct ip_tunnel *tun = netdev_priv(ol_dev);



	return tun->parms.iph.daddr;

}



static union mlxsw_sp_l3addr

mlxsw_sp_ipip_netdev_daddr(enum mlxsw_sp_l3proto proto,

			   const struct net_device *ol_dev)

{

	switch (proto) {

	case MLXSW_SP_L3_PROTO_IPV4:

		return (union mlxsw_sp_l3addr) {

			.addr4 = mlxsw_sp_ipip_netdev_daddr4(ol_dev),

		};

	case MLXSW_SP_L3_PROTO_IPV6:

		break;

	}



	WARN_ON(1);

	return (union mlxsw_sp_l3addr) {

		.addr4 = 0,

	};

}



static int

mlxsw_sp_ipip_nexthop_update_gre4(struct mlxsw_sp *mlxsw_sp, u32 adj_index,

				  struct mlxsw_sp_ipip_entry *ipip_entry)

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

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ 
#include "spectrum_router.h"

#include <net/ip_fib.h>



union mlxsw_sp_l3addr

mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,

			   const struct net_device *ol_dev);



enum mlxsw_sp_ipip_type {

	MLXSW_SP_IPIP_TYPE_GRE4,

	MLXSW_SP_IPIP_TYPE_MAX,

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

+0 −53
Original line number Diff line number Diff line
@@ -1016,59 +1016,6 @@ mlxsw_sp_ipip_entry_dealloc(struct mlxsw_sp_ipip_entry *ipip_entry) 
	kfree(ipip_entry);

}



static __be32

mlxsw_sp_ipip_netdev_saddr4(const struct net_device *ol_dev)

{

	struct ip_tunnel *tun = netdev_priv(ol_dev);



	return tun->parms.iph.saddr;

}



union mlxsw_sp_l3addr

mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,

			   const struct net_device *ol_dev)

{

	switch (proto) {

	case MLXSW_SP_L3_PROTO_IPV4:

		return (union mlxsw_sp_l3addr) {

			.addr4 = mlxsw_sp_ipip_netdev_saddr4(ol_dev),

		};

	case MLXSW_SP_L3_PROTO_IPV6:

		break;

	};



	WARN_ON(1);

	return (union mlxsw_sp_l3addr) {

		.addr4 = 0,

	};

}



__be32 mlxsw_sp_ipip_netdev_daddr4(const struct net_device *ol_dev)

{

	struct ip_tunnel *tun = netdev_priv(ol_dev);



	return tun->parms.iph.daddr;

}



union mlxsw_sp_l3addr

mlxsw_sp_ipip_netdev_daddr(enum mlxsw_sp_l3proto proto,

			   const struct net_device *ol_dev)

{

	switch (proto) {

	case MLXSW_SP_L3_PROTO_IPV4:

		return (union mlxsw_sp_l3addr) {

			.addr4 = mlxsw_sp_ipip_netdev_daddr4(ol_dev),

		};

	case MLXSW_SP_L3_PROTO_IPV6:

		break;

	};



	WARN_ON(1);

	return (union mlxsw_sp_l3addr) {

		.addr4 = 0,

	};

}



static bool mlxsw_sp_l3addr_eq(const union mlxsw_sp_l3addr *addr1,

			       const union mlxsw_sp_l3addr *addr2)

{

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

+0 −7
Original line number Diff line number Diff line
@@ -103,13 +103,6 @@ mlxsw_sp_neigh_entry_counter_update(struct mlxsw_sp *mlxsw_sp, 
				    struct mlxsw_sp_neigh_entry *neigh_entry,

				    bool adding);

bool mlxsw_sp_neigh_ipv6_ignore(struct mlxsw_sp_neigh_entry *neigh_entry);

union mlxsw_sp_l3addr

mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,

			   const struct net_device *ol_dev);

union mlxsw_sp_l3addr

mlxsw_sp_ipip_netdev_daddr(enum mlxsw_sp_l3proto proto,

			   const struct net_device *ol_dev);

__be32 mlxsw_sp_ipip_netdev_daddr4(const struct net_device *ol_dev);

struct mlxsw_sp_nexthop *mlxsw_sp_nexthop_next(struct mlxsw_sp_router *router,

					       struct mlxsw_sp_nexthop *nh);

bool mlxsw_sp_nexthop_offload(struct mlxsw_sp_nexthop *nh);