aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/ethtool.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-12-07 14:02:27 -0500
committerBen Hutchings <bhutchings@solarflare.com>2010-12-07 14:02:50 -0500
commit8891681af928f1da795cd4bd59043e5e0fadd6c8 (patch)
tree11a1d55774d82ffd2694ce68cea103b8416323ba /drivers/net/sfc/ethtool.c
parentac33ac610dc613b2b1c938f8b61eef651ab72563 (diff)
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>
Diffstat (limited to 'drivers/net/sfc/ethtool.c')
-rw-r--r--drivers/net/sfc/ethtool.c8
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)
558 if (rc) 558 if (rc)
559 return rc; 559 return rc;
560 560
561 if (!(data & ETH_FLAG_NTUPLE)) { 561 if (!(data & ETH_FLAG_NTUPLE))
562 efx_filter_table_clear(efx, EFX_FILTER_TABLE_RX_IP, 562 efx_filter_clear_rx(efx, EFX_FILTER_PRI_MANUAL);
563 EFX_FILTER_PRI_MANUAL);
564 efx_filter_table_clear(efx, EFX_FILTER_TABLE_RX_MAC,
565 EFX_FILTER_PRI_MANUAL);
566 }
567 563
568 return 0; 564 return 0;
569} 565}