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

Commit 94ab1ea9 authored by David S. Miller's avatar David S. Miller
Browse files

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



Jeff Kirsher says:

====================
1GbE Intel Wired LAN Driver Updates 2016-04-06

This series contains updates to e1000, e1000e, igb and Kconfig.

Alex fixes igb where we were casting the MAC address as __beXX and then
passing it into le32_to_cpu, when we could simply cast as __lexx to
maintain consistency since it is already little endian.  Then enabled
bulk free in transmit cleanup for igb.

John Holland enables igb to pickup the MAC address from a device tree
blob when CONFIG_OF has been enabled.

Doron Shikmoni fixes a bug in the output of "ethtool -m ethX" where
the data byte appeared duplicated.

Stefan fixes up e1000 and e1000e ethtool offline tests which were calling
dev_close() which causes IFF_UP to be cleared which removes teh interface
routes and some addresses, so use ndo_stop() instead.

Jiri Benc cleans up some old links in the Kconfig for Intel drivers where
we referred to a URL which is no longer valid.  I am so glad Jiri has the
time in his day to spend clicking on and testing all the URL links in the
the kernel.

Arika Chen reverts the addition of a 'rtnl_unlock()' which had a unmatched
'rtnl_lock()' call before it.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents de6099e2 d99e366f

drivers/net/ethernet/intel/Kconfig

+14 −66
Original line number Diff line number Diff line
@@ -25,16 +25,13 @@ config E100 
	  on the adapter. Look for a label that has a barcode and a number

	  in the format 123456-001 (six digits hyphen three digits).



	  Use the above information and the Adapter & Driver ID Guide at:

	  Use the above information and the Adapter & Driver ID Guide that

	  can be located at:



	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>

	  <http://support.intel.com>



	  to identify the adapter.



	  For the latest Intel PRO/100 network driver for Linux, see:



	  <http://www.intel.com/p/en_US/support/highlights/network/pro100plus>



	  More specific information on configuring the driver is in

	  <file:Documentation/networking/e100.txt>.
@@ -47,12 +44,7 @@ config E1000 
	---help---

	  This driver supports Intel(R) PRO/1000 gigabit ethernet family of

	  adapters.  For more information on how to identify your adapter, go

	  to the Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>



	  For general information and support, go to the Intel support

	  website at:

	  to the Adapter & Driver ID Guide that can be located at:



	  <http://support.intel.com>
@@ -71,12 +63,8 @@ config E1000E 
	  This driver supports the PCI-Express Intel(R) PRO/1000 gigabit

	  ethernet family of adapters. For PCI or PCI-X e1000 adapters,

	  use the regular e1000 driver For more information on how to

	  identify your adapter, go to the Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>



	  For general information and support, go to the Intel support

	  website at:

	  identify your adapter, go to the Adapter & Driver ID Guide that

	  can be located at:



	  <http://support.intel.com>
@@ -101,12 +89,7 @@ config IGB 
	---help---

	  This driver supports Intel(R) 82575/82576 gigabit ethernet family of

	  adapters.  For more information on how to identify your adapter, go

	  to the Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>



	  For general information and support, go to the Intel support

	  website at:

	  to the Adapter & Driver ID Guide that can be located at:



	  <http://support.intel.com>
@@ -142,12 +125,7 @@ config IGBVF 
	---help---

	  This driver supports Intel(R) 82576 virtual functions.  For more

	  information on how to identify your adapter, go to the Adapter &

	  Driver ID Guide at:



	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>



	  For general information and support, go to the Intel support

	  website at:

	  Driver ID Guide that can be located at:



	  <http://support.intel.com>
@@ -164,12 +142,7 @@ config IXGB 
	  This driver supports Intel(R) PRO/10GbE family of adapters for

	  PCI-X type cards. For PCI-E type cards, use the "ixgbe" driver

	  instead. For more information on how to identify your adapter, go

	  to the Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>



	  For general information and support, go to the Intel support

	  website at:

	  to the Adapter & Driver ID Guide that can be located at:



	  <http://support.intel.com>
@@ -187,12 +160,7 @@ config IXGBE 
	---help---

	  This driver supports Intel(R) 10GbE PCI Express family of

	  adapters.  For more information on how to identify your adapter, go

	  to the Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>



	  For general information and support, go to the Intel support

	  website at:

	  to the Adapter & Driver ID Guide that can be located at:



	  <http://support.intel.com>
@@ -243,12 +211,7 @@ config IXGBEVF 
	---help---

	  This driver supports Intel(R) PCI Express virtual functions for the

	  Intel(R) ixgbe driver.  For more information on how to identify your

	  adapter, go to the Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/sb/CS-008441.htm>



	  For general information and support, go to the Intel support

	  website at:

	  adapter, go to the Adapter & Driver ID Guide that can be located at:



	  <http://support.intel.com>
@@ -266,12 +229,7 @@ config I40E 
	---help---

	  This driver supports Intel(R) Ethernet Controller XL710 Family of

	  devices.  For more information on how to identify your adapter, go

	  to the Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>



	  For general information and support, go to the Intel support

	  website at:

	  to the Adapter & Driver ID Guide that can be located at:



	  <http://support.intel.com>
@@ -326,12 +284,7 @@ config I40EVF 
	---help---

	  This driver supports Intel(R) XL710 and X710 virtual functions.

	  For more information on how to identify your adapter, go to the

	  Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/sb/CS-008441.htm>



	  For general information and support, go to the Intel support

	  website at:

	  Adapter & Driver ID Guide that can be located at:



	  <http://support.intel.com>
@@ -347,12 +300,7 @@ config FM10K 
	---help---

	  This driver supports Intel(R) FM10000 Ethernet Switch Host

	  Interface.  For more information on how to identify your adapter,

	  go to the Adapter & Driver ID Guide at:



	  <http://support.intel.com/support/network/sb/CS-008441.htm>



	  For general information and support, go to the Intel support

	  website at:

	  go to the Adapter & Driver ID Guide that can be located at:



	  <http://support.intel.com>

drivers/net/ethernet/intel/e1000/e1000.h

+2 −0
Original line number Diff line number Diff line
@@ -358,6 +358,8 @@ struct net_device *e1000_get_hw_dev(struct e1000_hw *hw); 
extern char e1000_driver_name[];

extern const char e1000_driver_version[];



int e1000_open(struct net_device *netdev);

int e1000_close(struct net_device *netdev);

int e1000_up(struct e1000_adapter *adapter);

void e1000_down(struct e1000_adapter *adapter);

void e1000_reinit_locked(struct e1000_adapter *adapter);

drivers/net/ethernet/intel/e1000/e1000_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -1553,7 +1553,7 @@ static void e1000_diag_test(struct net_device *netdev, 


		if (if_running)

			/* indicate we're in test mode */

			dev_close(netdev);

			e1000_close(netdev);

		else

			e1000_reset(adapter);
@@ -1582,7 +1582,7 @@ static void e1000_diag_test(struct net_device *netdev, 
		e1000_reset(adapter);

		clear_bit(__E1000_TESTING, &adapter->flags);

		if (if_running)

			dev_open(netdev);

			e1000_open(netdev);

	} else {

		e_info(hw, "online testing starting\n");

		/* Online tests */

drivers/net/ethernet/intel/e1000/e1000_main.c

+4 −4
Original line number Diff line number Diff line
@@ -114,8 +114,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent); 
static void e1000_remove(struct pci_dev *pdev);

static int e1000_alloc_queues(struct e1000_adapter *adapter);

static int e1000_sw_init(struct e1000_adapter *adapter);

static int e1000_open(struct net_device *netdev);

static int e1000_close(struct net_device *netdev);

int e1000_open(struct net_device *netdev);

int e1000_close(struct net_device *netdev);

static void e1000_configure_tx(struct e1000_adapter *adapter);

static void e1000_configure_rx(struct e1000_adapter *adapter);

static void e1000_setup_rctl(struct e1000_adapter *adapter);
@@ -1360,7 +1360,7 @@ static int e1000_alloc_queues(struct e1000_adapter *adapter) 
 * handler is registered with the OS, the watchdog task is started,

 * and the stack is notified that the interface is ready.

 **/

static int e1000_open(struct net_device *netdev)

int e1000_open(struct net_device *netdev)

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_hw *hw = &adapter->hw;
@@ -1437,7 +1437,7 @@ static int e1000_open(struct net_device *netdev) 
 * needs to be disabled.  A global MAC reset is issued to stop the

 * hardware, and all transmit and receive resources are freed.

 **/

static int e1000_close(struct net_device *netdev)

int e1000_close(struct net_device *netdev)

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_hw *hw = &adapter->hw;

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

+2 −0
Original line number Diff line number Diff line
@@ -480,6 +480,8 @@ extern const char e1000e_driver_version[]; 
void e1000e_check_options(struct e1000_adapter *adapter);

void e1000e_set_ethtool_ops(struct net_device *netdev);



int e1000e_open(struct net_device *netdev);

int e1000e_close(struct net_device *netdev);

void e1000e_up(struct e1000_adapter *adapter);

void e1000e_down(struct e1000_adapter *adapter, bool reset);

void e1000e_reinit_locked(struct e1000_adapter *adapter);