diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2012-11-19 14:05:25 -0500 |
---|---|---|
committer | Ben Hutchings <bhutchings@solarflare.com> | 2013-08-22 14:25:47 -0400 |
commit | 910c485dc16be51fd6f4ed13cc14a39d7feacf7e (patch) | |
tree | da5056550679ce7efa5bdf6f3afed1b63a55de60 /drivers/net/ethernet/sfc | |
parent | be3fc09cdd4aca438613b1d50d00afa77e9b2046 (diff) |
sfc: Remove unused filter_flags variables and efx_farch_filter_id_flags()
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc')
-rw-r--r-- | drivers/net/ethernet/sfc/filter.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/net/ethernet/sfc/filter.c b/drivers/net/ethernet/sfc/filter.c index fb01fdbce90b..a588c95fae27 100644 --- a/drivers/net/ethernet/sfc/filter.c +++ b/drivers/net/ethernet/sfc/filter.c | |||
@@ -609,16 +609,6 @@ static inline unsigned int efx_filter_id_index(u32 id) | |||
609 | return id & EFX_FILTER_INDEX_MASK; | 609 | return id & EFX_FILTER_INDEX_MASK; |
610 | } | 610 | } |
611 | 611 | ||
612 | static inline u8 efx_filter_id_flags(u32 id) | ||
613 | { | ||
614 | unsigned int range = id >> EFX_FILTER_INDEX_WIDTH; | ||
615 | |||
616 | if (range < EFX_FILTER_MATCH_PRI_COUNT) | ||
617 | return EFX_FILTER_FLAG_RX; | ||
618 | else | ||
619 | return EFX_FILTER_FLAG_TX; | ||
620 | } | ||
621 | |||
622 | u32 efx_filter_get_rx_id_limit(struct efx_nic *efx) | 612 | u32 efx_filter_get_rx_id_limit(struct efx_nic *efx) |
623 | { | 613 | { |
624 | struct efx_filter_state *state = efx->filter_state; | 614 | struct efx_filter_state *state = efx->filter_state; |
@@ -829,7 +819,6 @@ int efx_filter_remove_id_safe(struct efx_nic *efx, | |||
829 | struct efx_filter_table *table; | 819 | struct efx_filter_table *table; |
830 | unsigned int filter_idx; | 820 | unsigned int filter_idx; |
831 | struct efx_filter_spec *spec; | 821 | struct efx_filter_spec *spec; |
832 | u8 filter_flags; | ||
833 | int rc; | 822 | int rc; |
834 | 823 | ||
835 | table_id = efx_filter_id_table_id(filter_id); | 824 | table_id = efx_filter_id_table_id(filter_id); |
@@ -842,8 +831,6 @@ int efx_filter_remove_id_safe(struct efx_nic *efx, | |||
842 | return -ENOENT; | 831 | return -ENOENT; |
843 | spec = &table->spec[filter_idx]; | 832 | spec = &table->spec[filter_idx]; |
844 | 833 | ||
845 | filter_flags = efx_filter_id_flags(filter_id); | ||
846 | |||
847 | spin_lock_bh(&state->lock); | 834 | spin_lock_bh(&state->lock); |
848 | 835 | ||
849 | if (test_bit(filter_idx, table->used_bitmap) && | 836 | if (test_bit(filter_idx, table->used_bitmap) && |
@@ -880,7 +867,6 @@ int efx_filter_get_filter_safe(struct efx_nic *efx, | |||
880 | struct efx_filter_table *table; | 867 | struct efx_filter_table *table; |
881 | struct efx_filter_spec *spec; | 868 | struct efx_filter_spec *spec; |
882 | unsigned int filter_idx; | 869 | unsigned int filter_idx; |
883 | u8 filter_flags; | ||
884 | int rc; | 870 | int rc; |
885 | 871 | ||
886 | table_id = efx_filter_id_table_id(filter_id); | 872 | table_id = efx_filter_id_table_id(filter_id); |
@@ -893,8 +879,6 @@ int efx_filter_get_filter_safe(struct efx_nic *efx, | |||
893 | return -ENOENT; | 879 | return -ENOENT; |
894 | spec = &table->spec[filter_idx]; | 880 | spec = &table->spec[filter_idx]; |
895 | 881 | ||
896 | filter_flags = efx_filter_id_flags(filter_id); | ||
897 | |||
898 | spin_lock_bh(&state->lock); | 882 | spin_lock_bh(&state->lock); |
899 | 883 | ||
900 | if (test_bit(filter_idx, table->used_bitmap) && | 884 | if (test_bit(filter_idx, table->used_bitmap) && |