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

Commit 7e58a6c6 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum_ipip: Extract mlxsw_sp_l3addr_is_zero 



Extract the logic for determining whether a given IPv4/IPv6 address is
all-zeroes from mlxsw_sp_ipip_tunnel_complete to a separate function.
Make that function public within the module.

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 63d63801

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

+11 −5
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2017 Mellanox Technologies. All rights reserved.

 * Copyright (c) 2017 Petr Machata <petrm@mellanox.com>

 * Copyright (c) 2017-2018 Mellanox Technologies. All rights reserved.

 * Copyright (c) 2017-2018 Petr Machata <petrm@mellanox.com>

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:
@@ -122,6 +122,13 @@ mlxsw_sp_ipip_netdev_daddr(enum mlxsw_sp_l3proto proto, 
	return (union mlxsw_sp_l3addr) {0};

}



bool mlxsw_sp_l3addr_is_zero(union mlxsw_sp_l3addr addr)

{

	union mlxsw_sp_l3addr naddr = {0};



	return !memcmp(&addr, &naddr, sizeof(naddr));

}



static int

mlxsw_sp_ipip_nexthop_update_gre4(struct mlxsw_sp *mlxsw_sp, u32 adj_index,

				  struct mlxsw_sp_ipip_entry *ipip_entry)
@@ -215,15 +222,14 @@ static bool mlxsw_sp_ipip_tunnel_complete(enum mlxsw_sp_l3proto proto, 
{

	union mlxsw_sp_l3addr saddr = mlxsw_sp_ipip_netdev_saddr(proto, ol_dev);

	union mlxsw_sp_l3addr daddr = mlxsw_sp_ipip_netdev_daddr(proto, ol_dev);

	union mlxsw_sp_l3addr naddr = {0};



	/* Tunnels with unset local or remote address are valid in Linux and

	 * used for lightweight tunnels (LWT) and Non-Broadcast Multi-Access

	 * (NBMA) tunnels. In principle these can be offloaded, but the driver

	 * currently doesn't support this. So punt.

	 */

	return memcmp(&saddr, &naddr, sizeof(naddr)) &&

	       memcmp(&daddr, &naddr, sizeof(naddr));

	return !mlxsw_sp_l3addr_is_zero(saddr) &&

	       !mlxsw_sp_l3addr_is_zero(daddr);

}



static bool mlxsw_sp_ipip_can_offload_gre4(const struct mlxsw_sp *mlxsw_sp,

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

+4 −2
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2017 Mellanox Technologies. All rights reserved.

 * Copyright (c) 2017 Petr Machata <petrm@mellanox.com>

 * Copyright (c) 2017-2018 Mellanox Technologies. All rights reserved.

 * Copyright (c) 2017-2018 Petr Machata <petrm@mellanox.com>

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:
@@ -46,6 +46,8 @@ union mlxsw_sp_l3addr 
mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,

			   const struct net_device *ol_dev);



bool mlxsw_sp_l3addr_is_zero(union mlxsw_sp_l3addr addr);



enum mlxsw_sp_ipip_type {

	MLXSW_SP_IPIP_TYPE_GRE4,

	MLXSW_SP_IPIP_TYPE_MAX,