diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2013-08-21 14:19:36 +0100 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2013-08-21 14:19:36 +0100 |
| commit | abc71bb939e3a789cc33ed46029bdff498bdc3a5 (patch) | |
| tree | 704f50b386979e012591183ab2b1ba5280831dab | |
| parent | 563b44951e76bd23ba3fabcc3a0c708d8f59c5fb (diff) | |
| parent | f3851b0acc5a75bd33c6d344a2e4f920e1622ff0 (diff) | |
| download | linux-abc71bb939e3a789cc33ed46029bdff498bdc3a5.tar.bz2 | |
Merge branch 'sfc-3.11'
Merge sfc fixes destined for 3.11 so we can avoid conflicts with
development for 3.12+.
| -rw-r--r-- | drivers/net/ethernet/sfc/filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/filter.c b/drivers/net/ethernet/sfc/filter.c index 2a469b27a506..30d744235d27 100644 --- a/drivers/net/ethernet/sfc/filter.c +++ b/drivers/net/ethernet/sfc/filter.c @@ -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); |