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

Commit 5b10ca19 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Mostly revert "e1000/e1000e: Move PCI-Express device IDs over to e1000e" 



The new e1000e driver is apparently not yet suitable for general use, so
mark it experimental, and re-instate all the PCI-Express device IDs in
the old and stable e1000 driver so that people (namely me) can continue
to use a driver that actually works.

Auke & co have been appraised of the situation.

Cc: Auke Kok <auke-jan.h.kok@intel.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9e97198d

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1992,7 +1992,7 @@ config E1000_DISABLE_PACKET_SPLIT 


config E1000E

	tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"

	depends on PCI

	depends on PCI && EXPERIMENTAL

	---help---

	  This driver supports the PCI-Express Intel(R) PRO/1000 gigabit

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

drivers/net/e1000/e1000_main.c

+27 −0
Original line number Diff line number Diff line
@@ -73,6 +73,14 @@ static struct pci_device_id e1000_pci_tbl[] = { 
	INTEL_E1000_ETHERNET_DEVICE(0x1026),

	INTEL_E1000_ETHERNET_DEVICE(0x1027),

	INTEL_E1000_ETHERNET_DEVICE(0x1028),

	INTEL_E1000_ETHERNET_DEVICE(0x1049),

	INTEL_E1000_ETHERNET_DEVICE(0x104A),

	INTEL_E1000_ETHERNET_DEVICE(0x104B),

	INTEL_E1000_ETHERNET_DEVICE(0x104C),

	INTEL_E1000_ETHERNET_DEVICE(0x104D),

	INTEL_E1000_ETHERNET_DEVICE(0x105E),

	INTEL_E1000_ETHERNET_DEVICE(0x105F),

	INTEL_E1000_ETHERNET_DEVICE(0x1060),

	INTEL_E1000_ETHERNET_DEVICE(0x1075),

	INTEL_E1000_ETHERNET_DEVICE(0x1076),

	INTEL_E1000_ETHERNET_DEVICE(0x1077),
@@ -81,9 +89,28 @@ static struct pci_device_id e1000_pci_tbl[] = { 
	INTEL_E1000_ETHERNET_DEVICE(0x107A),

	INTEL_E1000_ETHERNET_DEVICE(0x107B),

	INTEL_E1000_ETHERNET_DEVICE(0x107C),

	INTEL_E1000_ETHERNET_DEVICE(0x107D),

	INTEL_E1000_ETHERNET_DEVICE(0x107E),

	INTEL_E1000_ETHERNET_DEVICE(0x107F),

	INTEL_E1000_ETHERNET_DEVICE(0x108A),

	INTEL_E1000_ETHERNET_DEVICE(0x108B),

	INTEL_E1000_ETHERNET_DEVICE(0x108C),

	INTEL_E1000_ETHERNET_DEVICE(0x1096),

	INTEL_E1000_ETHERNET_DEVICE(0x1098),

	INTEL_E1000_ETHERNET_DEVICE(0x1099),

	INTEL_E1000_ETHERNET_DEVICE(0x109A),

	INTEL_E1000_ETHERNET_DEVICE(0x10A4),

	INTEL_E1000_ETHERNET_DEVICE(0x10A5),

	INTEL_E1000_ETHERNET_DEVICE(0x10B5),

	INTEL_E1000_ETHERNET_DEVICE(0x10B9),

	INTEL_E1000_ETHERNET_DEVICE(0x10BA),

	INTEL_E1000_ETHERNET_DEVICE(0x10BB),

	INTEL_E1000_ETHERNET_DEVICE(0x10BC),

	INTEL_E1000_ETHERNET_DEVICE(0x10C4),

	INTEL_E1000_ETHERNET_DEVICE(0x10C5),

	INTEL_E1000_ETHERNET_DEVICE(0x10D5),

	INTEL_E1000_ETHERNET_DEVICE(0x10D9),

	INTEL_E1000_ETHERNET_DEVICE(0x10DA),

	/* required last entry */

	{0,}

};