Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2266c68f3641df533f617426a9cac0e5fb443f69

Authored by David S. Miller
2 parents 9d47b38056 f3851b0acc
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file Side-by-side Diff

drivers/net/ethernet/sfc/filter.c
Diff comments   View file @ 2266c68
... ... @@ -675,7 +675,7 @@
675 675 BUILD_BUG_ON(EFX_FILTER_INDEX_UC_DEF != 0);
676 676 BUILD_BUG_ON(EFX_FILTER_INDEX_MC_DEF !=
677 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 679 ins_index = rep_index;
680 680  
681 681 spin_lock_bh(&state->lock);