diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-08-22 14:34:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-22 14:34:13 -0700 |
| commit | 2266c68f3641df533f617426a9cac0e5fb443f69 (patch) | |
| tree | 2aa6723fac48a555d98498f66fdd787b5b262661 /drivers | |
| parent | Revert "genetlink: fix family dump race" (diff) | |
| parent | sfc: Fix lookup of default RX MAC filters when steered using ethtool (diff) | |
| download | linux-dev-2266c68f3641df533f617426a9cac0e5fb443f69.tar.xz linux-dev-2266c68f3641df533f617426a9cac0e5fb443f69.zip | |
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>
Diffstat (limited to 'drivers')
| -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); |