sfc: Remove filter table IDs from filter functions

The separation between filter tables is largely an internal detail
and it may be removed in future hardware.  To prepare for that:

- Merge table ID with filter index to make an opaque filter ID
- Wrap efx_filter_table_clear() with a function that clears filters
  from both RX tables, which is all that the current caller requires

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c
index d51a6b1f4766..0f46c1a3171e 100644
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
@@ -558,12 +558,8 @@ static int efx_ethtool_set_flags(struct net_device *net_dev, u32 data)
         if (rc)
                 return rc;
 
-        if (!(data & ETH_FLAG_NTUPLE)) {
-                efx_filter_table_clear(efx, EFX_FILTER_TABLE_RX_IP,
-                                       EFX_FILTER_PRI_MANUAL);
-                efx_filter_table_clear(efx, EFX_FILTER_TABLE_RX_MAC,
-                                       EFX_FILTER_PRI_MANUAL);
-        }
+        if (!(data & ETH_FLAG_NTUPLE))
+                efx_filter_clear_rx(efx, EFX_FILTER_PRI_MANUAL);
 
         return 0;
 }