[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200630225038.1190589-1-kuba@kernel.org>
Date: Tue, 30 Jun 2020 15:50:38 -0700
From: Jakub Kicinski <kuba@...nel.org>
To: davem@...emloft.net
Cc: netdev@...r.kernel.org, ecree@...arflare.com,
mhabets@...arflare.com, linux-net-drivers@...arflare.com,
Jakub Kicinski <kuba@...nel.org>
Subject: [PATCH net-next] sfc: remove udp_tnl_has_port
Nothing seems to have ever been calling this.
Signed-off-by: Jakub Kicinski <kuba@...nel.org>
---
drivers/net/ethernet/sfc/ef10.c | 23 -----------------------
drivers/net/ethernet/sfc/net_driver.h | 2 --
2 files changed, 25 deletions(-)
diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index 5faf2f0e4d62..bd4f5eb5b098 100644
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -3907,28 +3907,6 @@ static int efx_ef10_udp_tnl_add_port(struct efx_nic *efx,
return rc;
}
-/* Called under the TX lock with the TX queue running, hence no-one can be
- * in the middle of updating the UDP tunnels table. However, they could
- * have tried and failed the MCDI, in which case they'll have set the dirty
- * flag before dropping their locks.
- */
-static bool efx_ef10_udp_tnl_has_port(struct efx_nic *efx, __be16 port)
-{
- struct efx_ef10_nic_data *nic_data = efx->nic_data;
-
- if (!(nic_data->datapath_caps &
- (1 << MC_CMD_GET_CAPABILITIES_OUT_VXLAN_NVGRE_LBN)))
- return false;
-
- if (nic_data->udp_tunnels_dirty)
- /* SW table may not match HW state, so just assume we can't
- * use any UDP tunnel offloads.
- */
- return false;
-
- return __efx_ef10_udp_tnl_lookup_port(efx, port) != NULL;
-}
-
static int efx_ef10_udp_tnl_del_port(struct efx_nic *efx,
struct efx_udp_tunnel tnl)
{
@@ -4216,7 +4194,6 @@ const struct efx_nic_type efx_hunt_a0_nic_type = {
.vlan_rx_kill_vid = efx_ef10_vlan_rx_kill_vid,
.udp_tnl_push_ports = efx_ef10_udp_tnl_push_ports,
.udp_tnl_add_port = efx_ef10_udp_tnl_add_port,
- .udp_tnl_has_port = efx_ef10_udp_tnl_has_port,
.udp_tnl_del_port = efx_ef10_udp_tnl_del_port,
#ifdef CONFIG_SFC_SRIOV
.sriov_configure = efx_ef10_sriov_configure,
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index e0b84b2e3bd2..69d58f2b638c 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -1298,7 +1298,6 @@ struct efx_udp_tunnel {
* If %NULL, then device does not support any TSO version.
* @udp_tnl_push_ports: Push the list of UDP tunnel ports to the NIC if required.
* @udp_tnl_add_port: Add a UDP tunnel port
- * @udp_tnl_has_port: Check if a port has been added as UDP tunnel
* @udp_tnl_del_port: Remove a UDP tunnel port
* @print_additional_fwver: Dump NIC-specific additional FW version info
* @revision: Hardware architecture revision
@@ -1472,7 +1471,6 @@ struct efx_nic_type {
u32 (*tso_versions)(struct efx_nic *efx);
int (*udp_tnl_push_ports)(struct efx_nic *efx);
int (*udp_tnl_add_port)(struct efx_nic *efx, struct efx_udp_tunnel tnl);
- bool (*udp_tnl_has_port)(struct efx_nic *efx, __be16 port);
int (*udp_tnl_del_port)(struct efx_nic *efx, struct efx_udp_tunnel tnl);
size_t (*print_additional_fwver)(struct efx_nic *efx, char *buf,
size_t len);
--
2.26.2
Powered by blists - more mailing lists