Commit abc71bb9 authored by Ben Hutchings's avatar Ben Hutchings
Browse files

Merge branch 'sfc-3.11' 

Merge sfc fixes destined for 3.11 so we can avoid conflicts with
development for 3.12+.
parents 563b4495 f3851b0a

drivers/net/ethernet/sfc/filter.c

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ s32 efx_filter_insert_filter(struct efx_nic *efx, struct efx_filter_spec *spec, 
		BUILD_BUG_ON(EFX_FILTER_INDEX_UC_DEF != 0);

		BUILD_BUG_ON(EFX_FILTER_INDEX_MC_DEF !=

			     EFX_FILTER_MC_DEF - EFX_FILTER_UC_DEF);

		rep_index = spec->type - EFX_FILTER_INDEX_UC_DEF;

		rep_index = spec->type - EFX_FILTER_UC_DEF;

		ins_index = rep_index;



		spin_lock_bh(&state->lock);