Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 633cc5fe authored Jun 03, 2015 by David S. Miller

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-06-03

This series contains updates to e1000e only.

Yanir provides 8 fixes and 1 version bump for e1000e.  First fix resolves
a possible unit hang if multiple descriptors are available in the rings
during reset or runtime suspend.  Fixed a warning on SPARC compile based
on a suggested solution from Alex Duyck.  Fixed a logical error, where
a "if" condition under which a flush should occur, was revered.  Fixed
a hardware issue that prevented i219 from working in legacy interrupts
mode.  Fixed the hardware clock configuration and suprious non-linear
increment.  Lastly, fixed a system hang which occurred during execution
of "ethtool -t <NIC>", by disabling MULR for the loopback test to avoid
the hand state.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 3896d655 529498cd

drivers/net/ethernet/intel/e1000e/80003es2lan.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	/* Intel PRO/1000 Linux driver		/* Intel PRO/1000 Linux driver
	* Copyright(c) 1999 - 2014 Intel Corporation.		* Copyright(c) 1999 - 2015 Intel Corporation.
	*		*
	* This program is free software; you can redistribute it and/or modify it		* This program is free software; you can redistribute it and/or modify it
	* under the terms and conditions of the GNU General Public License,		* under the terms and conditions of the GNU General Public License,

drivers/net/ethernet/intel/e1000e/80003es2lan.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	/* Intel PRO/1000 Linux driver		/* Intel PRO/1000 Linux driver
	* Copyright(c) 1999 - 2014 Intel Corporation.		* Copyright(c) 1999 - 2015 Intel Corporation.
	*		*
	* This program is free software; you can redistribute it and/or modify it		* This program is free software; you can redistribute it and/or modify it
	* under the terms and conditions of the GNU General Public License,		* under the terms and conditions of the GNU General Public License,

drivers/net/ethernet/intel/e1000e/82571.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	/* Intel PRO/1000 Linux driver		/* Intel PRO/1000 Linux driver
	* Copyright(c) 1999 - 2014 Intel Corporation.		* Copyright(c) 1999 - 2015 Intel Corporation.
	*		*
	* This program is free software; you can redistribute it and/or modify it		* This program is free software; you can redistribute it and/or modify it
	* under the terms and conditions of the GNU General Public License,		* under the terms and conditions of the GNU General Public License,

drivers/net/ethernet/intel/e1000e/82571.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	/* Intel PRO/1000 Linux driver		/* Intel PRO/1000 Linux driver
	* Copyright(c) 1999 - 2014 Intel Corporation.		* Copyright(c) 1999 - 2015 Intel Corporation.
	*		*
	* This program is free software; you can redistribute it and/or modify it		* This program is free software; you can redistribute it and/or modify it
	* under the terms and conditions of the GNU General Public License,		* under the terms and conditions of the GNU General Public License,

drivers/net/ethernet/intel/e1000e/defines.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	/* Intel PRO/1000 Linux driver		/* Intel PRO/1000 Linux driver
	* Copyright(c) 1999 - 2014 Intel Corporation.		* Copyright(c) 1999 - 2015 Intel Corporation.
	*		*
	* This program is free software; you can redistribute it and/or modify it		* This program is free software; you can redistribute it and/or modify it
	* under the terms and conditions of the GNU General Public License,		* under the terms and conditions of the GNU General Public License,