diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-22 17:34:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-22 17:34:13 -0400 |
| commit | 2266c68f3641df533f617426a9cac0e5fb443f69 (patch) | |
| tree | 2aa6723fac48a555d98498f66fdd787b5b262661 | |
| parent | 9d47b380563174e5c15776ce6ca9bab4ee7d59e3 (diff) | |
| parent | f3851b0acc5a75bd33c6d344a2e4f920e1622ff0 (diff) | |
Merge branch 'sfc-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc
Merge in a fix for RX MAC address filter programming bug in the sfc
driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -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, | |||
| 675 | BUILD_BUG_ON(EFX_FILTER_INDEX_UC_DEF != 0); | 675 | BUILD_BUG_ON(EFX_FILTER_INDEX_UC_DEF != 0); |
| 676 | BUILD_BUG_ON(EFX_FILTER_INDEX_MC_DEF != | 676 | BUILD_BUG_ON(EFX_FILTER_INDEX_MC_DEF != |
| 677 | EFX_FILTER_MC_DEF - EFX_FILTER_UC_DEF); | 677 | EFX_FILTER_MC_DEF - EFX_FILTER_UC_DEF); |
| 678 | rep_index = spec->type - EFX_FILTER_INDEX_UC_DEF; | 678 | rep_index = spec->type - EFX_FILTER_UC_DEF; |
| 679 | ins_index = rep_index; | 679 | ins_index = rep_index; |
| 680 | 680 | ||
| 681 | spin_lock_bh(&state->lock); | 681 | spin_lock_bh(&state->lock); |