This series contains fixes for e1000 and e1000e. Tushar Dave adds a check to the driver so that it won't attempt to disable a device that is already disabled for e1000.
Benjamin Poirier provides a fix to e1000e, where a previous commit that Benjamin submitted changed the meaning of the return value for "check_for_link" for copper media and not all the instances were properly updated. Benjamin fixes the remaining instances that needed the change. The following are changes since commit 2758b3e3e630ba304fc4aca434d591e70e528298: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net and are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue 1GbE Benjamin Poirier (1): e1000e: Fix e1000_check_for_copper_link_ich8lan return value. Tushar Dave (1): e1000: fix disabling already-disabled warning drivers/net/ethernet/intel/e1000/e1000.h | 3 ++- drivers/net/ethernet/intel/e1000/e1000_main.c | 27 ++++++++++++++++++++++----- drivers/net/ethernet/intel/e1000e/ich8lan.c | 11 ++++++++--- 3 files changed, 32 insertions(+), 9 deletions(-) -- 2.15.1
