Skip to contentSkip to conversation

drivers/net Documentation/networking: Create directory intel_wired_lan

RFC PATCH NAK Joe Perches 4 participants 12 messages Oct 10, 2010 – Oct 14, 2010

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 drivers/net Documentation/networking: Create directory intel_wired_lan

Perhaps it's better to move drivers from the very populated drivers/net directory into vendor specific directories similar to the Atheros approach used for drivers/net/wireless/ath/

Move intel drivers and Documentation to separate directories Create drivers/net/intel_wired_lan/Kconfig.<speed> and Makefile Modify drivers/net/Kconfig and Makefile
Update MAINTAINERS

---
 .../networking/{ => intel_wired_lan}/e100.txt      |    0
 .../networking/{ => intel_wired_lan}/e1000.txt     |    0
 .../networking/{ => intel_wired_lan}/igb.txt       |    0
 .../networking/{ => intel_wired_lan}/igbvf.txt     |    0
 .../networking/{ => intel_wired_lan}/ixgb.txt      |    0
 .../networking/{ => intel_wired_lan}/ixgbe.txt     |    0
 .../networking/{ => intel_wired_lan}/ixgbevf.txt   |    0
 MAINTAINERS                                        |   18 +--
 drivers/net/Kconfig                                |  214 +-------------------
 drivers/net/Makefile                               |    8 -
 drivers/net/intel_wired_lan/Kconfig.100            |   25 +++
 drivers/net/intel_wired_lan/Kconfig.1000           |  102 ++++++++++
 drivers/net/intel_wired_lan/Kconfig.10000          |   81 ++++++++
 drivers/net/intel_wired_lan/Makefile               |    9 +
 drivers/net/{ => intel_wired_lan}/e100.c           |    0
 drivers/net/{ => intel_wired_lan}/e1000/Makefile   |    0
 drivers/net/{ => intel_wired_lan}/e1000/e1000.h    |    0
 .../{ => intel_wired_lan}/e1000/e1000_ethtool.c    |    0
 drivers/net/{ => intel_wired_lan}/e1000/e1000_hw.c |    0
 drivers/net/{ => intel_wired_lan}/e1000/e1000_hw.h |    0
 .../net/{ => intel_wired_lan}/e1000/e1000_main.c   |    0
 .../net/{ => intel_wired_lan}/e1000/e1000_osdep.h  |    0
 .../net/{ => intel_wired_lan}/e1000/e1000_param.c  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/82571.c   |    0
 drivers/net/{ => intel_wired_lan}/e1000e/Makefile  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/defines.h |    0
 drivers/net/{ => intel_wired_lan}/e1000e/e1000.h   |    0
 drivers/net/{ => intel_wired_lan}/e1000e/es2lan.c  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/ethtool.c |    0
 drivers/net/{ => intel_wired_lan}/e1000e/hw.h      |    0
 drivers/net/{ => intel_wired_lan}/e1000e/ich8lan.c |    0
 drivers/net/{ => intel_wired_lan}/e1000e/lib.c     |    0
 drivers/net/{ => intel_wired_lan}/e1000e/netdev.c  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/param.c   |    0
 drivers/net/{ => intel_wired_lan}/e1000e/phy.c     |    0
 drivers/net/{ => intel_wired_lan}/igb/Makefile     |    0
 .../net/{ => intel_wired_lan}/igb/e1000_82575.c    |    0
 .../net/{ => intel_wired_lan}/igb/e1000_82575.h    |    0
 .../net/{ => intel_wired_lan}/igb/e1000_defines.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_hw.h   |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mac.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mac.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mbx.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mbx.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_nvm.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_nvm.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_phy.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_phy.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_regs.h |    0
 drivers/net/{ => intel_wired_lan}/igb/igb.h        |    0
 .../net/{ => intel_wired_lan}/igb/igb_ethtool.c    |    0
 drivers/net/{ => intel_wired_lan}/igb/igb_main.c   |    0
 drivers/net/{ => intel_wired_lan}/igbvf/Makefile   |    0
 drivers/net/{ => intel_wired_lan}/igbvf/defines.h  |    0
 drivers/net/{ => intel_wired_lan}/igbvf/ethtool.c  |    0
 drivers/net/{ => intel_wired_lan}/igbvf/igbvf.h    |    0
 drivers/net/{ => intel_wired_lan}/igbvf/mbx.c      |    0
 drivers/net/{ => intel_wired_lan}/igbvf/mbx.h      |    0
 drivers/net/{ => intel_wired_lan}/igbvf/netdev.c   |    0
 drivers/net/{ => intel_wired_lan}/igbvf/regs.h     |    0
 drivers/net/{ => intel_wired_lan}/igbvf/vf.c       |    0
 drivers/net/{ => intel_wired_lan}/igbvf/vf.h       |    0
 drivers/net/{ => intel_wired_lan}/ixgb/Makefile    |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb.h      |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_ee.c   |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_ee.h   |    0
 .../net/{ => intel_wired_lan}/ixgb/ixgb_ethtool.c  |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_hw.c   |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_hw.h   |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_ids.h  |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_main.c |    0
 .../net/{ => intel_wired_lan}/ixgb/ixgb_osdep.h    |    0
 .../net/{ => intel_wired_lan}/ixgb/ixgb_param.c    |    0
 drivers/net/{ => intel_wired_lan}/ixgbe/Makefile   |    0
 drivers/net/{ => intel_wired_lan}/ixgbe/ixgbe.h    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_82598.c  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_82599.c  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_common.c |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_common.h |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_dcb.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_dcb.h    |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82598.c  |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82598.h  |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82599.c  |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82599.h  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_dcb_nl.c |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_ethtool.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_fcoe.c   |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_fcoe.h   |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_main.c   |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_mbx.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_mbx.h    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_phy.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_phy.h    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_sriov.c  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_sriov.h  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_type.h   |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/Makefile |    0
 .../net/{ => intel_wired_lan}/ixgbevf/defines.h    |    0
 .../net/{ => intel_wired_lan}/ixgbevf/ethtool.c    |    0
 .../net/{ => intel_wired_lan}/ixgbevf/ixgbevf.h    |    0
 .../{ => intel_wired_lan}/ixgbevf/ixgbevf_main.c   |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/mbx.c    |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/mbx.h    |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/regs.h   |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/vf.c     |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/vf.h     |    0
 107 files changed, 224 insertions(+), 233 deletions(-)
Documentation/networking/intel_wired_lan/e100.txt renamed from Documentation/networking/e100.txt +0 -0
similarity index 100%
rename from Documentation/networking/e100.txt
rename to Documentation/networking/intel_wired_lan/e100.txt
Documentation/networking/intel_wired_lan/e1000.txt renamed from Documentation/networking/e1000.txt +0 -0
similarity index 100%
rename from Documentation/networking/e1000.txt
rename to Documentation/networking/intel_wired_lan/e1000.txt
Documentation/networking/intel_wired_lan/igb.txt renamed from Documentation/networking/igb.txt +0 -0
similarity index 100%
rename from Documentation/networking/igb.txt
rename to Documentation/networking/intel_wired_lan/igb.txt
Documentation/networking/intel_wired_lan/igbvf.txt renamed from Documentation/networking/igbvf.txt +0 -0
similarity index 100%
rename from Documentation/networking/igbvf.txt
rename to Documentation/networking/intel_wired_lan/igbvf.txt
Documentation/networking/intel_wired_lan/ixgb.txt renamed from Documentation/networking/ixgb.txt +0 -0
similarity index 100%
rename from Documentation/networking/ixgb.txt
rename to Documentation/networking/intel_wired_lan/ixgb.txt
Documentation/networking/intel_wired_lan/ixgbe.txt renamed from Documentation/networking/ixgbe.txt +0 -0
similarity index 100%
rename from Documentation/networking/ixgbe.txt
rename to Documentation/networking/intel_wired_lan/ixgbe.txt
Documentation/networking/intel_wired_lan/ixgbevf.txt renamed from Documentation/networking/ixgbevf.txt +0 -0
similarity index 100%
rename from Documentation/networking/ixgbevf.txt
rename to Documentation/networking/intel_wired_lan/ixgbevf.txt
MAINTAINERS +2 -16
index ba8603c..b086404 100644
@@ -3096,22 +3096,8 @@ M:	John Ronciak <[email protected]>
 L:	[email protected]
 W:	http://e1000.sourceforge.net/
 S:	Supported
-F:	Documentation/networking/e100.txt
-F:	Documentation/networking/e1000.txt
-F:	Documentation/networking/e1000e.txt
-F:	Documentation/networking/igb.txt
-F:	Documentation/networking/igbvf.txt
-F:	Documentation/networking/ixgb.txt
-F:	Documentation/networking/ixgbe.txt
-F:	Documentation/networking/ixgbevf.txt
-F:	drivers/net/e100.c
-F:	drivers/net/e1000/
-F:	drivers/net/e1000e/
-F:	drivers/net/igb/
-F:	drivers/net/igbvf/
-F:	drivers/net/ixgb/
-F:	drivers/net/ixgbe/
-F:	drivers/net/ixgbevf/
+F:	Documentation/networking/intel_wired_lan/
+F:	drivers/net/intel_wired_lan/
 
 INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
 L:	[email protected]
drivers/net/Kconfig +5 -209

256 lines not on this page · raw message

drivers/net/Makefile +0 -8
index b8bf93d..e457b3c 100644
@@ -8,14 +8,7 @@ obj-$(CONFIG_PHYLIB) += phy/
 
 obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
 
-obj-$(CONFIG_E1000) += e1000/
-obj-$(CONFIG_E1000E) += e1000e/
 obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
-obj-$(CONFIG_IGB) += igb/
-obj-$(CONFIG_IGBVF) += igbvf/
-obj-$(CONFIG_IXGBE) += ixgbe/
-obj-$(CONFIG_IXGBEVF) += ixgbevf/
-obj-$(CONFIG_IXGB) += ixgb/
 obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_CHELSIO_T1) += chelsio/
 obj-$(CONFIG_CHELSIO_T3) += cxgb3/
@@ -68,7 +61,6 @@ obj-$(CONFIG_VORTEX) += 3c59x.o
 obj-$(CONFIG_TYPHOON) += typhoon.o
 obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
 obj-$(CONFIG_PCNET32) += pcnet32.o
-obj-$(CONFIG_E100) += e100.o
 obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_EPIC100) += epic100.o
 obj-$(CONFIG_SMSC9420) += smsc9420.o
drivers/net/intel_wired_lan/Kconfig.100 new file +25 -0
new file mode 100644
index 0000000..6651ae9
@@ -0,0 +1,25 @@
+config E100
+	tristate "Intel(R) PRO/100+ support"
+	depends on NET_PCI && PCI
+	select MII
+	---help---
+	  This driver supports Intel(R) PRO/100 family of adapters.
+	  To verify that your adapter is supported, find the board ID number
+	  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:
+
+	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+          to identify the adapter.
+
+	  For the latest Intel PRO/100 network driver for Linux, see:
+
+	  <http://appsr.intel.com/scripts-df/support_intel.asp>
+
+	  More specific information on configuring the driver is in
+	  <file:Documentation/networking/intel_wired_lan/e100.txt>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called e100.
drivers/net/intel_wired_lan/Kconfig.1000 new file +102 -0

102 lines not on this page · raw message

drivers/net/intel_wired_lan/Kconfig.10000 new file +81 -0

81 lines not on this page · raw message

drivers/net/intel_wired_lan/Makefile new file +9 -0
new file mode 100644
index 0000000..87d7ba0
@@ -0,0 +1,9 @@
+obj-$(CONFIG_E1000) += e1000/
+obj-$(CONFIG_E1000E) += e1000e/
+obj-$(CONFIG_IGB) += igb/
+obj-$(CONFIG_IGBVF) += igbvf/
+obj-$(CONFIG_IXGBE) += ixgbe/
+obj-$(CONFIG_IXGBEVF) += ixgbevf/
+obj-$(CONFIG_IXGB) += ixgb/
+
+obj-$(CONFIG_E100) += e100.o
drivers/net/intel_wired_lan/e100.c renamed from drivers/net/e100.c +0 -0
similarity index 100%
rename from drivers/net/e100.c
rename to drivers/net/intel_wired_lan/e100.c
drivers/net/intel_wired_lan/e1000/Makefile renamed from drivers/net/e1000/Makefile +0 -0
similarity index 100%
rename from drivers/net/e1000/Makefile
rename to drivers/net/intel_wired_lan/e1000/Makefile
drivers/net/intel_wired_lan/e1000/e1000.h renamed from drivers/net/e1000/e1000.h +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000.h
rename to drivers/net/intel_wired_lan/e1000/e1000.h
drivers/net/intel_wired_lan/e1000/e1000_ethtool.c renamed from drivers/net/e1000/e1000_ethtool.c +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_ethtool.c
rename to drivers/net/intel_wired_lan/e1000/e1000_ethtool.c
drivers/net/intel_wired_lan/e1000/e1000_hw.c renamed from drivers/net/e1000/e1000_hw.c +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_hw.c
rename to drivers/net/intel_wired_lan/e1000/e1000_hw.c
drivers/net/intel_wired_lan/e1000/e1000_hw.h renamed from drivers/net/e1000/e1000_hw.h +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_hw.h
rename to drivers/net/intel_wired_lan/e1000/e1000_hw.h
drivers/net/intel_wired_lan/e1000/e1000_main.c renamed from drivers/net/e1000/e1000_main.c +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_main.c
rename to drivers/net/intel_wired_lan/e1000/e1000_main.c
drivers/net/intel_wired_lan/e1000/e1000_osdep.h renamed from drivers/net/e1000/e1000_osdep.h +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_osdep.h
rename to drivers/net/intel_wired_lan/e1000/e1000_osdep.h
drivers/net/intel_wired_lan/e1000/e1000_param.c renamed from drivers/net/e1000/e1000_param.c +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_param.c
rename to drivers/net/intel_wired_lan/e1000/e1000_param.c
drivers/net/intel_wired_lan/e1000e/82571.c renamed from drivers/net/e1000e/82571.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/82571.c
rename to drivers/net/intel_wired_lan/e1000e/82571.c
drivers/net/intel_wired_lan/e1000e/Makefile renamed from drivers/net/e1000e/Makefile +0 -0
similarity index 100%
rename from drivers/net/e1000e/Makefile
rename to drivers/net/intel_wired_lan/e1000e/Makefile
drivers/net/intel_wired_lan/e1000e/defines.h renamed from drivers/net/e1000e/defines.h +0 -0
similarity index 100%
rename from drivers/net/e1000e/defines.h
rename to drivers/net/intel_wired_lan/e1000e/defines.h
drivers/net/intel_wired_lan/e1000e/e1000.h renamed from drivers/net/e1000e/e1000.h +0 -0
similarity index 100%
rename from drivers/net/e1000e/e1000.h
rename to drivers/net/intel_wired_lan/e1000e/e1000.h
drivers/net/intel_wired_lan/e1000e/es2lan.c renamed from drivers/net/e1000e/es2lan.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/es2lan.c
rename to drivers/net/intel_wired_lan/e1000e/es2lan.c
drivers/net/intel_wired_lan/e1000e/ethtool.c renamed from drivers/net/e1000e/ethtool.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/ethtool.c
rename to drivers/net/intel_wired_lan/e1000e/ethtool.c
drivers/net/intel_wired_lan/e1000e/hw.h renamed from drivers/net/e1000e/hw.h +0 -0
similarity index 100%
rename from drivers/net/e1000e/hw.h
rename to drivers/net/intel_wired_lan/e1000e/hw.h
drivers/net/intel_wired_lan/e1000e/ich8lan.c renamed from drivers/net/e1000e/ich8lan.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/ich8lan.c
rename to drivers/net/intel_wired_lan/e1000e/ich8lan.c
drivers/net/intel_wired_lan/e1000e/lib.c renamed from drivers/net/e1000e/lib.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/lib.c
rename to drivers/net/intel_wired_lan/e1000e/lib.c
drivers/net/intel_wired_lan/e1000e/netdev.c renamed from drivers/net/e1000e/netdev.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/netdev.c
rename to drivers/net/intel_wired_lan/e1000e/netdev.c
drivers/net/intel_wired_lan/e1000e/param.c renamed from drivers/net/e1000e/param.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/param.c
rename to drivers/net/intel_wired_lan/e1000e/param.c
drivers/net/intel_wired_lan/e1000e/phy.c renamed from drivers/net/e1000e/phy.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/phy.c
rename to drivers/net/intel_wired_lan/e1000e/phy.c
drivers/net/intel_wired_lan/igb/Makefile renamed from drivers/net/igb/Makefile +0 -0
similarity index 100%
rename from drivers/net/igb/Makefile
rename to drivers/net/intel_wired_lan/igb/Makefile
drivers/net/intel_wired_lan/igb/e1000_82575.c renamed from drivers/net/igb/e1000_82575.c +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_82575.c
rename to drivers/net/intel_wired_lan/igb/e1000_82575.c
drivers/net/intel_wired_lan/igb/e1000_82575.h renamed from drivers/net/igb/e1000_82575.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_82575.h
rename to drivers/net/intel_wired_lan/igb/e1000_82575.h
drivers/net/intel_wired_lan/igb/e1000_defines.h renamed from drivers/net/igb/e1000_defines.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_defines.h
rename to drivers/net/intel_wired_lan/igb/e1000_defines.h
drivers/net/intel_wired_lan/igb/e1000_hw.h renamed from drivers/net/igb/e1000_hw.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_hw.h
rename to drivers/net/intel_wired_lan/igb/e1000_hw.h
drivers/net/intel_wired_lan/igb/e1000_mac.c renamed from drivers/net/igb/e1000_mac.c +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_mac.c
rename to drivers/net/intel_wired_lan/igb/e1000_mac.c
drivers/net/intel_wired_lan/igb/e1000_mac.h renamed from drivers/net/igb/e1000_mac.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_mac.h
rename to drivers/net/intel_wired_lan/igb/e1000_mac.h
drivers/net/intel_wired_lan/igb/e1000_mbx.c renamed from drivers/net/igb/e1000_mbx.c +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_mbx.c
rename to drivers/net/intel_wired_lan/igb/e1000_mbx.c
drivers/net/intel_wired_lan/igb/e1000_mbx.h renamed from drivers/net/igb/e1000_mbx.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_mbx.h
rename to drivers/net/intel_wired_lan/igb/e1000_mbx.h
drivers/net/intel_wired_lan/igb/e1000_nvm.c renamed from drivers/net/igb/e1000_nvm.c +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_nvm.c
rename to drivers/net/intel_wired_lan/igb/e1000_nvm.c
drivers/net/intel_wired_lan/igb/e1000_nvm.h renamed from drivers/net/igb/e1000_nvm.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_nvm.h
rename to drivers/net/intel_wired_lan/igb/e1000_nvm.h
drivers/net/intel_wired_lan/igb/e1000_phy.c renamed from drivers/net/igb/e1000_phy.c +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_phy.c
rename to drivers/net/intel_wired_lan/igb/e1000_phy.c
drivers/net/intel_wired_lan/igb/e1000_phy.h renamed from drivers/net/igb/e1000_phy.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_phy.h
rename to drivers/net/intel_wired_lan/igb/e1000_phy.h
drivers/net/intel_wired_lan/igb/e1000_regs.h renamed from drivers/net/igb/e1000_regs.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_regs.h
rename to drivers/net/intel_wired_lan/igb/e1000_regs.h
drivers/net/intel_wired_lan/igb/igb.h renamed from drivers/net/igb/igb.h +0 -0
similarity index 100%
rename from drivers/net/igb/igb.h
rename to drivers/net/intel_wired_lan/igb/igb.h
drivers/net/intel_wired_lan/igb/igb_ethtool.c renamed from drivers/net/igb/igb_ethtool.c +0 -0
similarity index 100%
rename from drivers/net/igb/igb_ethtool.c
rename to drivers/net/intel_wired_lan/igb/igb_ethtool.c
drivers/net/intel_wired_lan/igb/igb_main.c renamed from drivers/net/igb/igb_main.c +0 -0
similarity index 100%
rename from drivers/net/igb/igb_main.c
rename to drivers/net/intel_wired_lan/igb/igb_main.c
drivers/net/intel_wired_lan/igbvf/Makefile renamed from drivers/net/igbvf/Makefile +0 -0
similarity index 100%
rename from drivers/net/igbvf/Makefile
rename to drivers/net/intel_wired_lan/igbvf/Makefile
drivers/net/intel_wired_lan/igbvf/defines.h renamed from drivers/net/igbvf/defines.h +0 -0
similarity index 100%
rename from drivers/net/igbvf/defines.h
rename to drivers/net/intel_wired_lan/igbvf/defines.h
drivers/net/intel_wired_lan/igbvf/ethtool.c renamed from drivers/net/igbvf/ethtool.c +0 -0
similarity index 100%
rename from drivers/net/igbvf/ethtool.c
rename to drivers/net/intel_wired_lan/igbvf/ethtool.c
drivers/net/intel_wired_lan/igbvf/igbvf.h renamed from drivers/net/igbvf/igbvf.h +0 -0
similarity index 100%
rename from drivers/net/igbvf/igbvf.h
rename to drivers/net/intel_wired_lan/igbvf/igbvf.h
drivers/net/intel_wired_lan/igbvf/mbx.c renamed from drivers/net/igbvf/mbx.c +0 -0
similarity index 100%
rename from drivers/net/igbvf/mbx.c
rename to drivers/net/intel_wired_lan/igbvf/mbx.c
drivers/net/intel_wired_lan/igbvf/mbx.h renamed from drivers/net/igbvf/mbx.h +0 -0
similarity index 100%
rename from drivers/net/igbvf/mbx.h
rename to drivers/net/intel_wired_lan/igbvf/mbx.h
drivers/net/intel_wired_lan/igbvf/netdev.c renamed from drivers/net/igbvf/netdev.c +0 -0
similarity index 100%
rename from drivers/net/igbvf/netdev.c
rename to drivers/net/intel_wired_lan/igbvf/netdev.c
drivers/net/intel_wired_lan/igbvf/regs.h renamed from drivers/net/igbvf/regs.h +0 -0
similarity index 100%
rename from drivers/net/igbvf/regs.h
rename to drivers/net/intel_wired_lan/igbvf/regs.h
drivers/net/intel_wired_lan/igbvf/vf.c renamed from drivers/net/igbvf/vf.c +0 -0
similarity index 100%
rename from drivers/net/igbvf/vf.c
rename to drivers/net/intel_wired_lan/igbvf/vf.c
drivers/net/intel_wired_lan/igbvf/vf.h renamed from drivers/net/igbvf/vf.h +0 -0
similarity index 100%
rename from drivers/net/igbvf/vf.h
rename to drivers/net/intel_wired_lan/igbvf/vf.h
drivers/net/intel_wired_lan/ixgb/Makefile renamed from drivers/net/ixgb/Makefile +0 -0
similarity index 100%
rename from drivers/net/ixgb/Makefile
rename to drivers/net/intel_wired_lan/ixgb/Makefile
drivers/net/intel_wired_lan/ixgb/ixgb.h renamed from drivers/net/ixgb/ixgb.h +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb.h
drivers/net/intel_wired_lan/ixgb/ixgb_ee.c renamed from drivers/net/ixgb/ixgb_ee.c +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_ee.c
rename to drivers/net/intel_wired_lan/ixgb/ixgb_ee.c
drivers/net/intel_wired_lan/ixgb/ixgb_ee.h renamed from drivers/net/ixgb/ixgb_ee.h +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_ee.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb_ee.h
drivers/net/intel_wired_lan/ixgb/ixgb_ethtool.c renamed from drivers/net/ixgb/ixgb_ethtool.c +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_ethtool.c
rename to drivers/net/intel_wired_lan/ixgb/ixgb_ethtool.c
drivers/net/intel_wired_lan/ixgb/ixgb_hw.c renamed from drivers/net/ixgb/ixgb_hw.c +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_hw.c
rename to drivers/net/intel_wired_lan/ixgb/ixgb_hw.c
drivers/net/intel_wired_lan/ixgb/ixgb_hw.h renamed from drivers/net/ixgb/ixgb_hw.h +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_hw.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb_hw.h
drivers/net/intel_wired_lan/ixgb/ixgb_ids.h renamed from drivers/net/ixgb/ixgb_ids.h +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_ids.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb_ids.h
drivers/net/intel_wired_lan/ixgb/ixgb_main.c renamed from drivers/net/ixgb/ixgb_main.c +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_main.c
rename to drivers/net/intel_wired_lan/ixgb/ixgb_main.c
drivers/net/intel_wired_lan/ixgb/ixgb_osdep.h renamed from drivers/net/ixgb/ixgb_osdep.h +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_osdep.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb_osdep.h
drivers/net/intel_wired_lan/ixgb/ixgb_param.c renamed from drivers/net/ixgb/ixgb_param.c +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_param.c
rename to drivers/net/intel_wired_lan/ixgb/ixgb_param.c
drivers/net/intel_wired_lan/ixgbe/Makefile renamed from drivers/net/ixgbe/Makefile +0 -0
similarity index 100%
rename from drivers/net/ixgbe/Makefile
rename to drivers/net/intel_wired_lan/ixgbe/Makefile
drivers/net/intel_wired_lan/ixgbe/ixgbe.h renamed from drivers/net/ixgbe/ixgbe.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_82598.c renamed from drivers/net/ixgbe/ixgbe_82598.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_82598.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_82598.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_82599.c renamed from drivers/net/ixgbe/ixgbe_82599.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_82599.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_82599.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_common.c renamed from drivers/net/ixgbe/ixgbe_common.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_common.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_common.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_common.h renamed from drivers/net/ixgbe/ixgbe_common.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_common.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_common.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.c renamed from drivers/net/ixgbe/ixgbe_dcb.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.h renamed from drivers/net/ixgbe/ixgbe_dcb.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.c renamed from drivers/net/ixgbe/ixgbe_dcb_82598.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82598.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.h renamed from drivers/net/ixgbe/ixgbe_dcb_82598.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82598.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.c renamed from drivers/net/ixgbe/ixgbe_dcb_82599.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82599.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.h renamed from drivers/net/ixgbe/ixgbe_dcb_82599.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82599.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_nl.c renamed from drivers/net/ixgbe/ixgbe_dcb_nl.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_nl.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_nl.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_ethtool.c renamed from drivers/net/ixgbe/ixgbe_ethtool.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_ethtool.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_ethtool.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.c renamed from drivers/net/ixgbe/ixgbe_fcoe.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_fcoe.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.h renamed from drivers/net/ixgbe/ixgbe_fcoe.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_fcoe.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_main.c renamed from drivers/net/ixgbe/ixgbe_main.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_main.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_main.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.c renamed from drivers/net/ixgbe/ixgbe_mbx.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_mbx.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.h renamed from drivers/net/ixgbe/ixgbe_mbx.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_mbx.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.c renamed from drivers/net/ixgbe/ixgbe_phy.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_phy.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.h renamed from drivers/net/ixgbe/ixgbe_phy.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_phy.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.c renamed from drivers/net/ixgbe/ixgbe_sriov.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_sriov.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.h renamed from drivers/net/ixgbe/ixgbe_sriov.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_sriov.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_type.h renamed from drivers/net/ixgbe/ixgbe_type.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_type.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_type.h
drivers/net/intel_wired_lan/ixgbevf/Makefile renamed from drivers/net/ixgbevf/Makefile +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/Makefile
rename to drivers/net/intel_wired_lan/ixgbevf/Makefile
drivers/net/intel_wired_lan/ixgbevf/defines.h renamed from drivers/net/ixgbevf/defines.h +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/defines.h
rename to drivers/net/intel_wired_lan/ixgbevf/defines.h
drivers/net/intel_wired_lan/ixgbevf/ethtool.c renamed from drivers/net/ixgbevf/ethtool.c +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/ethtool.c
rename to drivers/net/intel_wired_lan/ixgbevf/ethtool.c
drivers/net/intel_wired_lan/ixgbevf/ixgbevf.h renamed from drivers/net/ixgbevf/ixgbevf.h +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/ixgbevf.h
rename to drivers/net/intel_wired_lan/ixgbevf/ixgbevf.h
drivers/net/intel_wired_lan/ixgbevf/ixgbevf_main.c renamed from drivers/net/ixgbevf/ixgbevf_main.c +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/ixgbevf_main.c
rename to drivers/net/intel_wired_lan/ixgbevf/ixgbevf_main.c
drivers/net/intel_wired_lan/ixgbevf/mbx.c renamed from drivers/net/ixgbevf/mbx.c +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/mbx.c
rename to drivers/net/intel_wired_lan/ixgbevf/mbx.c
drivers/net/intel_wired_lan/ixgbevf/mbx.h renamed from drivers/net/ixgbevf/mbx.h +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/mbx.h
rename to drivers/net/intel_wired_lan/ixgbevf/mbx.h
drivers/net/intel_wired_lan/ixgbevf/regs.h renamed from drivers/net/ixgbevf/regs.h +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/regs.h
rename to drivers/net/intel_wired_lan/ixgbevf/regs.h
drivers/net/intel_wired_lan/ixgbevf/vf.c renamed from drivers/net/ixgbevf/vf.c +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/vf.c
rename to drivers/net/intel_wired_lan/ixgbevf/vf.c
drivers/net/intel_wired_lan/ixgbevf/vf.h renamed from drivers/net/ixgbevf/vf.h +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/vf.h
rename to drivers/net/intel_wired_lan/ixgbevf/vf.h

------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired

#1 lore raw

drivers/net/intel_wired_lan/ixgbevf/vf.h

Quoted 1,083 lines · On Sun, 10 Oct 2010 13:42:32 -0700 Joe Perches <[email protected]> wrote:

Perhaps it's better to move drivers from the very populated drivers/net directory into vendor specific directories similar to the Atheros approach used for drivers/net/wireless/ath/

Move intel drivers and Documentation to separate directories Create drivers/net/intel_wired_lan/Kconfig.<speed> and Makefile Modify drivers/net/Kconfig and Makefile
Update MAINTAINERS

---
 .../networking/{ => intel_wired_lan}/e100.txt      |    0
 .../networking/{ => intel_wired_lan}/e1000.txt     |    0
 .../networking/{ => intel_wired_lan}/igb.txt       |    0
 .../networking/{ => intel_wired_lan}/igbvf.txt     |    0
 .../networking/{ => intel_wired_lan}/ixgb.txt      |    0
 .../networking/{ => intel_wired_lan}/ixgbe.txt     |    0
 .../networking/{ => intel_wired_lan}/ixgbevf.txt   |    0
 MAINTAINERS                                        |   18 +--
 drivers/net/Kconfig                                |  214 +-------------------
 drivers/net/Makefile                               |    8 -
 drivers/net/intel_wired_lan/Kconfig.100            |   25 +++
 drivers/net/intel_wired_lan/Kconfig.1000           |  102 ++++++++++
 drivers/net/intel_wired_lan/Kconfig.10000          |   81 ++++++++
 drivers/net/intel_wired_lan/Makefile               |    9 +
 drivers/net/{ => intel_wired_lan}/e100.c           |    0
 drivers/net/{ => intel_wired_lan}/e1000/Makefile   |    0
 drivers/net/{ => intel_wired_lan}/e1000/e1000.h    |    0
 .../{ => intel_wired_lan}/e1000/e1000_ethtool.c    |    0
 drivers/net/{ => intel_wired_lan}/e1000/e1000_hw.c |    0
 drivers/net/{ => intel_wired_lan}/e1000/e1000_hw.h |    0
 .../net/{ => intel_wired_lan}/e1000/e1000_main.c   |    0
 .../net/{ => intel_wired_lan}/e1000/e1000_osdep.h  |    0
 .../net/{ => intel_wired_lan}/e1000/e1000_param.c  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/82571.c   |    0
 drivers/net/{ => intel_wired_lan}/e1000e/Makefile  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/defines.h |    0
 drivers/net/{ => intel_wired_lan}/e1000e/e1000.h   |    0
 drivers/net/{ => intel_wired_lan}/e1000e/es2lan.c  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/ethtool.c |    0
 drivers/net/{ => intel_wired_lan}/e1000e/hw.h      |    0
 drivers/net/{ => intel_wired_lan}/e1000e/ich8lan.c |    0
 drivers/net/{ => intel_wired_lan}/e1000e/lib.c     |    0
 drivers/net/{ => intel_wired_lan}/e1000e/netdev.c  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/param.c   |    0
 drivers/net/{ => intel_wired_lan}/e1000e/phy.c     |    0
 drivers/net/{ => intel_wired_lan}/igb/Makefile     |    0
 .../net/{ => intel_wired_lan}/igb/e1000_82575.c    |    0
 .../net/{ => intel_wired_lan}/igb/e1000_82575.h    |    0
 .../net/{ => intel_wired_lan}/igb/e1000_defines.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_hw.h   |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mac.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mac.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mbx.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mbx.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_nvm.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_nvm.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_phy.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_phy.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_regs.h |    0
 drivers/net/{ => intel_wired_lan}/igb/igb.h        |    0
 .../net/{ => intel_wired_lan}/igb/igb_ethtool.c    |    0
 drivers/net/{ => intel_wired_lan}/igb/igb_main.c   |    0
 drivers/net/{ => intel_wired_lan}/igbvf/Makefile   |    0
 drivers/net/{ => intel_wired_lan}/igbvf/defines.h  |    0
 drivers/net/{ => intel_wired_lan}/igbvf/ethtool.c  |    0
 drivers/net/{ => intel_wired_lan}/igbvf/igbvf.h    |    0
 drivers/net/{ => intel_wired_lan}/igbvf/mbx.c      |    0
 drivers/net/{ => intel_wired_lan}/igbvf/mbx.h      |    0
 drivers/net/{ => intel_wired_lan}/igbvf/netdev.c   |    0
 drivers/net/{ => intel_wired_lan}/igbvf/regs.h     |    0
 drivers/net/{ => intel_wired_lan}/igbvf/vf.c       |    0
 drivers/net/{ => intel_wired_lan}/igbvf/vf.h       |    0
 drivers/net/{ => intel_wired_lan}/ixgb/Makefile    |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb.h      |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_ee.c   |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_ee.h   |    0
 .../net/{ => intel_wired_lan}/ixgb/ixgb_ethtool.c  |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_hw.c   |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_hw.h   |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_ids.h  |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_main.c |    0
 .../net/{ => intel_wired_lan}/ixgb/ixgb_osdep.h    |    0
 .../net/{ => intel_wired_lan}/ixgb/ixgb_param.c    |    0
 drivers/net/{ => intel_wired_lan}/ixgbe/Makefile   |    0
 drivers/net/{ => intel_wired_lan}/ixgbe/ixgbe.h    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_82598.c  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_82599.c  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_common.c |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_common.h |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_dcb.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_dcb.h    |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82598.c  |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82598.h  |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82599.c  |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82599.h  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_dcb_nl.c |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_ethtool.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_fcoe.c   |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_fcoe.h   |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_main.c   |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_mbx.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_mbx.h    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_phy.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_phy.h    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_sriov.c  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_sriov.h  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_type.h   |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/Makefile |    0
 .../net/{ => intel_wired_lan}/ixgbevf/defines.h    |    0
 .../net/{ => intel_wired_lan}/ixgbevf/ethtool.c    |    0
 .../net/{ => intel_wired_lan}/ixgbevf/ixgbevf.h    |    0
 .../{ => intel_wired_lan}/ixgbevf/ixgbevf_main.c   |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/mbx.c    |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/mbx.h    |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/regs.h   |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/vf.c     |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/vf.h     |    0
 107 files changed, 224 insertions(+), 233 deletions(-)
Documentation/networking/intel_wired_lan/e100.txt renamed from Documentation/networking/e100.txt +0 -0
similarity index 100%
rename from Documentation/networking/e100.txt
rename to Documentation/networking/intel_wired_lan/e100.txt
Documentation/networking/intel_wired_lan/e1000.txt renamed from Documentation/networking/e1000.txt +0 -0
similarity index 100%
rename from Documentation/networking/e1000.txt
rename to Documentation/networking/intel_wired_lan/e1000.txt
Documentation/networking/intel_wired_lan/igb.txt renamed from Documentation/networking/igb.txt +0 -0
similarity index 100%
rename from Documentation/networking/igb.txt
rename to Documentation/networking/intel_wired_lan/igb.txt
Documentation/networking/intel_wired_lan/igbvf.txt renamed from Documentation/networking/igbvf.txt +0 -0
similarity index 100%
rename from Documentation/networking/igbvf.txt
rename to Documentation/networking/intel_wired_lan/igbvf.txt
Documentation/networking/intel_wired_lan/ixgb.txt renamed from Documentation/networking/ixgb.txt +0 -0
similarity index 100%
rename from Documentation/networking/ixgb.txt
rename to Documentation/networking/intel_wired_lan/ixgb.txt
Documentation/networking/intel_wired_lan/ixgbe.txt renamed from Documentation/networking/ixgbe.txt +0 -0
similarity index 100%
rename from Documentation/networking/ixgbe.txt
rename to Documentation/networking/intel_wired_lan/ixgbe.txt
Documentation/networking/intel_wired_lan/ixgbevf.txt renamed from Documentation/networking/ixgbevf.txt +0 -0
similarity index 100%
rename from Documentation/networking/ixgbevf.txt
rename to Documentation/networking/intel_wired_lan/ixgbevf.txt
MAINTAINERS +2 -16
index ba8603c..b086404 100644
@@ -3096,22 +3096,8 @@ M:	John Ronciak <[email protected]>
 L:	[email protected]
 W:	http://e1000.sourceforge.net/
 S:	Supported
-F:	Documentation/networking/e100.txt
-F:	Documentation/networking/e1000.txt
-F:	Documentation/networking/e1000e.txt
-F:	Documentation/networking/igb.txt
-F:	Documentation/networking/igbvf.txt
-F:	Documentation/networking/ixgb.txt
-F:	Documentation/networking/ixgbe.txt
-F:	Documentation/networking/ixgbevf.txt
-F:	drivers/net/e100.c
-F:	drivers/net/e1000/
-F:	drivers/net/e1000e/
-F:	drivers/net/igb/
-F:	drivers/net/igbvf/
-F:	drivers/net/ixgb/
-F:	drivers/net/ixgbe/
-F:	drivers/net/ixgbevf/
+F:	Documentation/networking/intel_wired_lan/
+F:	drivers/net/intel_wired_lan/
 
 INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
 L:	[email protected]
drivers/net/Kconfig +5 -209
index 13d01f3..4d6448d 100644
@@ -1495,32 +1495,6 @@ config TC35815
 	depends on NET_PCI && PCI && MIPS
 	select PHYLIB
 
-config E100
-	tristate "Intel(R) PRO/100+ support"
-	depends on NET_PCI && PCI
-	select MII
-	---help---
-	  This driver supports Intel(R) PRO/100 family of adapters.
-	  To verify that your adapter is supported, find the board ID number 
-	  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:
-
-	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
-
-          to identify the adapter.
-
-	  For the latest Intel PRO/100 network driver for Linux, see:
-
-	  <http://appsr.intel.com/scripts-df/support_intel.asp>
-
-	  More specific information on configuring the driver is in 
-	  <file:Documentation/networking/e100.txt>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called e100.
-
 config LNE390
 	tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)"
 	depends on NET_PCI && EISA && EXPERIMENTAL
@@ -1995,6 +1969,8 @@ source "drivers/net/fs_enet/Kconfig"
 
 source "drivers/net/octeon/Kconfig"
 
+source "drivers/net/intel_wired_lan/Kconfig.100"
+
 endif # NET_ETHERNET
 
 #
@@ -2059,45 +2035,7 @@ config DL2K
 	  To compile this driver as a module, choose M here: the
 	  module will be called dl2k.
 
-config E1000
-	tristate "Intel(R) PRO/1000 Gigabit Ethernet support"
-	depends on PCI
-	---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:
-
-	  <http://support.intel.com>
-
-	  More specific information on configuring the driver is in 
-	  <file:Documentation/networking/e1000.txt>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called e1000.
-
-config E1000E
-	tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
-	depends on PCI && (!SPARC32 || BROKEN)
-	---help---
-	  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:
-
-	  <http://support.intel.com>
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called e1000e.
+source "drivers/net/intel_wired_lan/Kconfig.1000"
 
 config IP1000
 	tristate "IP1000 Gigabit Ethernet support"
@@ -2109,57 +2047,6 @@ config IP1000
 	  To compile this driver as a module, choose M here: the module
 	  will be called ipg.  This is recommended.
 
-config IGB
-       tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support"
-       depends on PCI
-       ---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:
-
-         <http://support.intel.com>
-
-         More specific information on configuring the driver is in
-         <file:Documentation/networking/e1000.txt>.
-
-         To compile this driver as a module, choose M here. The module
-         will be called igb.
-
-config IGB_DCA
-	bool "Direct Cache Access (DCA) Support"
-	default y
-	depends on IGB && DCA && !(IGB=y && DCA=m)
-	---help---
-	  Say Y here if you want to use Direct Cache Access (DCA) in the
-	  driver.  DCA is a method for warming the CPU cache before data
-	  is used, with the intent of lessening the impact of cache misses.
-
-config IGBVF
-       tristate "Intel(R) 82576 Virtual Function Ethernet support"
-       depends on PCI
-       ---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:
-
-         <http://support.intel.com>
-
-         More specific information on configuring the driver is in
-         <file:Documentation/networking/e1000.txt>.
-
-         To compile this driver as a module, choose M here. The module
-         will be called igbvf.
-
 source "drivers/net/ixp2000/Kconfig"
 
 config MYRI_SBUS
@@ -2515,17 +2402,6 @@ config S6GMAC
 
 source "drivers/net/stmmac/Kconfig"
 
-config PCH_GBE
-	tristate "PCH Gigabit Ethernet"
-	depends on PCI
-	---help---
-	  This is a gigabit ethernet driver for Topcliff PCH.
-	  Topcliff PCH is the platform controller hub that is used in Intel's
-	  general embedded platform.
-	  Topcliff PCH has Gigabit Ethernet interface.
-	  Using this interface, it is able to access system devices connected
-	  to Gigabit Ethernet.
-	  This driver enables Gigabit Ethernet function.
 
 endif # NETDEV_1000
 
@@ -2659,94 +2535,14 @@ config EHEA
 	  To compile the driver as a module, choose M here. The module
 	  will be called ehea.
 
+source "drivers/net/intel_wired_lan/Kconfig.10000"
+
 config ENIC
 	tristate "Cisco VIC Ethernet NIC Support"
 	depends on PCI && INET
 	help
 	  This enables the support for the Cisco VIC Ethernet card.
 
-config IXGBE
-	tristate "Intel(R) 10GbE PCI Express adapters support"
-	depends on PCI && INET
-	select MDIO
-	---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:
-
-	  <http://support.intel.com>
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ixgbe.
-
-config IXGBE_DCA
-	bool "Direct Cache Access (DCA) Support"
-	default y
-	depends on IXGBE && DCA && !(IXGBE=y && DCA=m)
-	---help---
-	  Say Y here if you want to use Direct Cache Access (DCA) in the
-	  driver.  DCA is a method for warming the CPU cache before data
-	  is used, with the intent of lessening the impact of cache misses.
-
-config IXGBE_DCB
-	bool "Data Center Bridging (DCB) Support"
-	default n
-	depends on IXGBE && DCB
-	---help---
-	  Say Y here if you want to use Data Center Bridging (DCB) in the
-	  driver.
-
-	  If unsure, say N.
-
-config IXGBEVF
-       tristate "Intel(R) 82599 Virtual Function Ethernet support"
-       depends on PCI_MSI
-       ---help---
-         This driver supports Intel(R) 82599 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:
-
-         <http://support.intel.com>
-
-         More specific information on configuring the driver is in
-         <file:Documentation/networking/ixgbevf.txt>.
-
-         To compile this driver as a module, choose M here. The module
-         will be called ixgbevf.  MSI-X interrupt support is required
-         for this driver to work correctly.
-
-config IXGB
-	tristate "Intel(R) PRO/10GbE support"
-	depends on PCI
-	---help---
-	  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:
-
-	  <http://support.intel.com>
-
-	  More specific information on configuring the driver is in 
-	  <file:Documentation/networking/ixgb.txt>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called ixgb.
-
 config S2IO
 	tristate "S2IO 10Gbe XFrame NIC"
 	depends on PCI
drivers/net/Makefile +0 -8
index b8bf93d..e457b3c 100644
@@ -8,14 +8,7 @@ obj-$(CONFIG_PHYLIB) += phy/
 
 obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
 
-obj-$(CONFIG_E1000) += e1000/
-obj-$(CONFIG_E1000E) += e1000e/
 obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
-obj-$(CONFIG_IGB) += igb/
-obj-$(CONFIG_IGBVF) += igbvf/
-obj-$(CONFIG_IXGBE) += ixgbe/
-obj-$(CONFIG_IXGBEVF) += ixgbevf/
-obj-$(CONFIG_IXGB) += ixgb/
 obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_CHELSIO_T1) += chelsio/
 obj-$(CONFIG_CHELSIO_T3) += cxgb3/
@@ -68,7 +61,6 @@ obj-$(CONFIG_VORTEX) += 3c59x.o
 obj-$(CONFIG_TYPHOON) += typhoon.o
 obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
 obj-$(CONFIG_PCNET32) += pcnet32.o
-obj-$(CONFIG_E100) += e100.o
 obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_EPIC100) += epic100.o
 obj-$(CONFIG_SMSC9420) += smsc9420.o
drivers/net/intel_wired_lan/Kconfig.100 new file +25 -0
new file mode 100644
index 0000000..6651ae9
@@ -0,0 +1,25 @@
+config E100
+	tristate "Intel(R) PRO/100+ support"
+	depends on NET_PCI && PCI
+	select MII
+	---help---
+	  This driver supports Intel(R) PRO/100 family of adapters.
+	  To verify that your adapter is supported, find the board ID number
+	  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:
+
+	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+          to identify the adapter.
+
+	  For the latest Intel PRO/100 network driver for Linux, see:
+
+	  <http://appsr.intel.com/scripts-df/support_intel.asp>
+
+	  More specific information on configuring the driver is in
+	  <file:Documentation/networking/intel_wired_lan/e100.txt>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called e100.
drivers/net/intel_wired_lan/Kconfig.1000 new file +102 -0
new file mode 100644
index 0000000..4a7e13a
@@ -0,0 +1,102 @@
+config E1000
+	tristate "Intel(R) PRO/1000 Gigabit Ethernet support"
+	depends on PCI
+	---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:
+
+	  <http://support.intel.com>
+
+	  More specific information on configuring the driver is in
+	  <file:Documentation/networking/intel_wired_lan/e1000.txt>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called e1000.
+
+config E1000E
+	tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
+	depends on PCI && (!SPARC32 || BROKEN)
+	---help---
+	  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:
+
+	  <http://support.intel.com>
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called e1000e.
+
+config IGB
+       tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support"
+       depends on PCI
+       ---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:
+
+         <http://support.intel.com>
+
+         More specific information on configuring the driver is in
+         <file:Documentation/networking/intel_wired_lan/e1000.txt>.
+
+         To compile this driver as a module, choose M here. The module
+         will be called igb.
+
+config IGB_DCA
+	bool "Direct Cache Access (DCA) Support"
+	default y
+	depends on IGB && DCA && !(IGB=y && DCA=m)
+	---help---
+	  Say Y here if you want to use Direct Cache Access (DCA) in the
+	  driver.  DCA is a method for warming the CPU cache before data
+	  is used, with the intent of lessening the impact of cache misses.
+
+config IGBVF
+       tristate "Intel(R) 82576 Virtual Function Ethernet support"
+       depends on PCI
+       ---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:
+
+         <http://support.intel.com>
+
+         More specific information on configuring the driver is in
+         <file:Documentation/networking/intel_wired_lan/e1000.txt>.
+
+         To compile this driver as a module, choose M here. The module
+         will be called igbvf.
+
+config PCH_GBE
+	tristate "PCH Gigabit Ethernet"
+	depends on PCI
+	---help---
+	  This is a gigabit ethernet driver for Topcliff PCH.
+	  Topcliff PCH is the platform controller hub that is used in Intel's
+	  general embedded platform.
+	  Topcliff PCH has Gigabit Ethernet interface.
+	  Using this interface, it is able to access system devices connected
+	  to Gigabit Ethernet.
+	  This driver enables Gigabit Ethernet function.
drivers/net/intel_wired_lan/Kconfig.10000 new file +81 -0
new file mode 100644
index 0000000..ef35ebd
@@ -0,0 +1,81 @@
+config IXGBE
+	tristate "Intel(R) 10GbE PCI Express adapters support"
+	depends on PCI && INET
+	select MDIO
+	---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:
+
+	  <http://support.intel.com>
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called ixgbe.
+
+config IXGBE_DCA
+	bool "Direct Cache Access (DCA) Support"
+	default y
+	depends on IXGBE && DCA && !(IXGBE=y && DCA=m)
+	---help---
+	  Say Y here if you want to use Direct Cache Access (DCA) in the
+	  driver.  DCA is a method for warming the CPU cache before data
+	  is used, with the intent of lessening the impact of cache misses.
+
+config IXGBE_DCB
+	bool "Data Center Bridging (DCB) Support"
+	default n
+	depends on IXGBE && DCB
+	---help---
+	  Say Y here if you want to use Data Center Bridging (DCB) in the
+	  driver.
+
+	  If unsure, say N.
+
+config IXGBEVF
+       tristate "Intel(R) 82599 Virtual Function Ethernet support"
+       depends on PCI_MSI
+       ---help---
+         This driver supports Intel(R) 82599 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:
+
+         <http://support.intel.com>
+
+         More specific information on configuring the driver is in
+         <file:Documentation/networking/intel_wired_lan/ixgbevf.txt>.
+
+         To compile this driver as a module, choose M here. The module
+         will be called ixgbevf.  MSI-X interrupt support is required
+         for this driver to work correctly.
+
+config IXGB
+	tristate "Intel(R) PRO/10GbE support"
+	depends on PCI
+	---help---
+	  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:
+
+	  <http://support.intel.com>
+
+	  More specific information on configuring the driver is in
+	  <file:Documentation/networking/intel_wired_lan/ixgb.txt>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called ixgb.
drivers/net/intel_wired_lan/Makefile new file +9 -0
new file mode 100644
index 0000000..87d7ba0
@@ -0,0 +1,9 @@
+obj-$(CONFIG_E1000) += e1000/
+obj-$(CONFIG_E1000E) += e1000e/
+obj-$(CONFIG_IGB) += igb/
+obj-$(CONFIG_IGBVF) += igbvf/
+obj-$(CONFIG_IXGBE) += ixgbe/
+obj-$(CONFIG_IXGBEVF) += ixgbevf/
+obj-$(CONFIG_IXGB) += ixgb/
+
+obj-$(CONFIG_E100) += e100.o
drivers/net/intel_wired_lan/e100.c renamed from drivers/net/e100.c +0 -0
similarity index 100%
rename from drivers/net/e100.c
rename to drivers/net/intel_wired_lan/e100.c
drivers/net/intel_wired_lan/e1000/Makefile renamed from drivers/net/e1000/Makefile +0 -0
similarity index 100%
rename from drivers/net/e1000/Makefile
rename to drivers/net/intel_wired_lan/e1000/Makefile
drivers/net/intel_wired_lan/e1000/e1000.h renamed from drivers/net/e1000/e1000.h +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000.h
rename to drivers/net/intel_wired_lan/e1000/e1000.h
drivers/net/intel_wired_lan/e1000/e1000_ethtool.c renamed from drivers/net/e1000/e1000_ethtool.c +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_ethtool.c
rename to drivers/net/intel_wired_lan/e1000/e1000_ethtool.c
drivers/net/intel_wired_lan/e1000/e1000_hw.c renamed from drivers/net/e1000/e1000_hw.c +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_hw.c
rename to drivers/net/intel_wired_lan/e1000/e1000_hw.c
drivers/net/intel_wired_lan/e1000/e1000_hw.h renamed from drivers/net/e1000/e1000_hw.h +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_hw.h
rename to drivers/net/intel_wired_lan/e1000/e1000_hw.h
drivers/net/intel_wired_lan/e1000/e1000_main.c renamed from drivers/net/e1000/e1000_main.c +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_main.c
rename to drivers/net/intel_wired_lan/e1000/e1000_main.c
drivers/net/intel_wired_lan/e1000/e1000_osdep.h renamed from drivers/net/e1000/e1000_osdep.h +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_osdep.h
rename to drivers/net/intel_wired_lan/e1000/e1000_osdep.h
drivers/net/intel_wired_lan/e1000/e1000_param.c renamed from drivers/net/e1000/e1000_param.c +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_param.c
rename to drivers/net/intel_wired_lan/e1000/e1000_param.c
drivers/net/intel_wired_lan/e1000e/82571.c renamed from drivers/net/e1000e/82571.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/82571.c
rename to drivers/net/intel_wired_lan/e1000e/82571.c
drivers/net/intel_wired_lan/e1000e/Makefile renamed from drivers/net/e1000e/Makefile +0 -0
similarity index 100%
rename from drivers/net/e1000e/Makefile
rename to drivers/net/intel_wired_lan/e1000e/Makefile
drivers/net/intel_wired_lan/e1000e/defines.h renamed from drivers/net/e1000e/defines.h +0 -0
similarity index 100%
rename from drivers/net/e1000e/defines.h
rename to drivers/net/intel_wired_lan/e1000e/defines.h
drivers/net/intel_wired_lan/e1000e/e1000.h renamed from drivers/net/e1000e/e1000.h +0 -0
similarity index 100%
rename from drivers/net/e1000e/e1000.h
rename to drivers/net/intel_wired_lan/e1000e/e1000.h
drivers/net/intel_wired_lan/e1000e/es2lan.c renamed from drivers/net/e1000e/es2lan.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/es2lan.c
rename to drivers/net/intel_wired_lan/e1000e/es2lan.c
drivers/net/intel_wired_lan/e1000e/ethtool.c renamed from drivers/net/e1000e/ethtool.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/ethtool.c
rename to drivers/net/intel_wired_lan/e1000e/ethtool.c
drivers/net/intel_wired_lan/e1000e/hw.h renamed from drivers/net/e1000e/hw.h +0 -0
similarity index 100%
rename from drivers/net/e1000e/hw.h
rename to drivers/net/intel_wired_lan/e1000e/hw.h
drivers/net/intel_wired_lan/e1000e/ich8lan.c renamed from drivers/net/e1000e/ich8lan.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/ich8lan.c
rename to drivers/net/intel_wired_lan/e1000e/ich8lan.c
drivers/net/intel_wired_lan/e1000e/lib.c renamed from drivers/net/e1000e/lib.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/lib.c
rename to drivers/net/intel_wired_lan/e1000e/lib.c
drivers/net/intel_wired_lan/e1000e/netdev.c renamed from drivers/net/e1000e/netdev.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/netdev.c
rename to drivers/net/intel_wired_lan/e1000e/netdev.c
drivers/net/intel_wired_lan/e1000e/param.c renamed from drivers/net/e1000e/param.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/param.c
rename to drivers/net/intel_wired_lan/e1000e/param.c
drivers/net/intel_wired_lan/e1000e/phy.c renamed from drivers/net/e1000e/phy.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/phy.c
rename to drivers/net/intel_wired_lan/e1000e/phy.c
drivers/net/intel_wired_lan/igb/Makefile renamed from drivers/net/igb/Makefile +0 -0
similarity index 100%
rename from drivers/net/igb/Makefile
rename to drivers/net/intel_wired_lan/igb/Makefile
drivers/net/intel_wired_lan/igb/e1000_82575.c renamed from drivers/net/igb/e1000_82575.c +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_82575.c
rename to drivers/net/intel_wired_lan/igb/e1000_82575.c
drivers/net/intel_wired_lan/igb/e1000_82575.h renamed from drivers/net/igb/e1000_82575.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_82575.h
rename to drivers/net/intel_wired_lan/igb/e1000_82575.h
drivers/net/intel_wired_lan/igb/e1000_defines.h renamed from drivers/net/igb/e1000_defines.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_defines.h
rename to drivers/net/intel_wired_lan/igb/e1000_defines.h
drivers/net/intel_wired_lan/igb/e1000_hw.h renamed from drivers/net/igb/e1000_hw.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_hw.h
rename to drivers/net/intel_wired_lan/igb/e1000_hw.h
drivers/net/intel_wired_lan/igb/e1000_mac.c renamed from drivers/net/igb/e1000_mac.c +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_mac.c
rename to drivers/net/intel_wired_lan/igb/e1000_mac.c
drivers/net/intel_wired_lan/igb/e1000_mac.h renamed from drivers/net/igb/e1000_mac.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_mac.h
rename to drivers/net/intel_wired_lan/igb/e1000_mac.h
drivers/net/intel_wired_lan/igb/e1000_mbx.c renamed from drivers/net/igb/e1000_mbx.c +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_mbx.c
rename to drivers/net/intel_wired_lan/igb/e1000_mbx.c
drivers/net/intel_wired_lan/igb/e1000_mbx.h renamed from drivers/net/igb/e1000_mbx.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_mbx.h
rename to drivers/net/intel_wired_lan/igb/e1000_mbx.h
drivers/net/intel_wired_lan/igb/e1000_nvm.c renamed from drivers/net/igb/e1000_nvm.c +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_nvm.c
rename to drivers/net/intel_wired_lan/igb/e1000_nvm.c
drivers/net/intel_wired_lan/igb/e1000_nvm.h renamed from drivers/net/igb/e1000_nvm.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_nvm.h
rename to drivers/net/intel_wired_lan/igb/e1000_nvm.h
drivers/net/intel_wired_lan/igb/e1000_phy.c renamed from drivers/net/igb/e1000_phy.c +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_phy.c
rename to drivers/net/intel_wired_lan/igb/e1000_phy.c
drivers/net/intel_wired_lan/igb/e1000_phy.h renamed from drivers/net/igb/e1000_phy.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_phy.h
rename to drivers/net/intel_wired_lan/igb/e1000_phy.h
drivers/net/intel_wired_lan/igb/e1000_regs.h renamed from drivers/net/igb/e1000_regs.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_regs.h
rename to drivers/net/intel_wired_lan/igb/e1000_regs.h
drivers/net/intel_wired_lan/igb/igb.h renamed from drivers/net/igb/igb.h +0 -0
similarity index 100%
rename from drivers/net/igb/igb.h
rename to drivers/net/intel_wired_lan/igb/igb.h
drivers/net/intel_wired_lan/igb/igb_ethtool.c renamed from drivers/net/igb/igb_ethtool.c +0 -0
similarity index 100%
rename from drivers/net/igb/igb_ethtool.c
rename to drivers/net/intel_wired_lan/igb/igb_ethtool.c
drivers/net/intel_wired_lan/igb/igb_main.c renamed from drivers/net/igb/igb_main.c +0 -0
similarity index 100%
rename from drivers/net/igb/igb_main.c
rename to drivers/net/intel_wired_lan/igb/igb_main.c
drivers/net/intel_wired_lan/igbvf/Makefile renamed from drivers/net/igbvf/Makefile +0 -0
similarity index 100%
rename from drivers/net/igbvf/Makefile
rename to drivers/net/intel_wired_lan/igbvf/Makefile
drivers/net/intel_wired_lan/igbvf/defines.h renamed from drivers/net/igbvf/defines.h +0 -0
similarity index 100%
rename from drivers/net/igbvf/defines.h
rename to drivers/net/intel_wired_lan/igbvf/defines.h
drivers/net/intel_wired_lan/igbvf/ethtool.c renamed from drivers/net/igbvf/ethtool.c +0 -0
similarity index 100%
rename from drivers/net/igbvf/ethtool.c
rename to drivers/net/intel_wired_lan/igbvf/ethtool.c
drivers/net/intel_wired_lan/igbvf/igbvf.h renamed from drivers/net/igbvf/igbvf.h +0 -0
similarity index 100%
rename from drivers/net/igbvf/igbvf.h
rename to drivers/net/intel_wired_lan/igbvf/igbvf.h
drivers/net/intel_wired_lan/igbvf/mbx.c renamed from drivers/net/igbvf/mbx.c +0 -0
similarity index 100%
rename from drivers/net/igbvf/mbx.c
rename to drivers/net/intel_wired_lan/igbvf/mbx.c
drivers/net/intel_wired_lan/igbvf/mbx.h renamed from drivers/net/igbvf/mbx.h +0 -0
similarity index 100%
rename from drivers/net/igbvf/mbx.h
rename to drivers/net/intel_wired_lan/igbvf/mbx.h
drivers/net/intel_wired_lan/igbvf/netdev.c renamed from drivers/net/igbvf/netdev.c +0 -0
similarity index 100%
rename from drivers/net/igbvf/netdev.c
rename to drivers/net/intel_wired_lan/igbvf/netdev.c
drivers/net/intel_wired_lan/igbvf/regs.h renamed from drivers/net/igbvf/regs.h +0 -0
similarity index 100%
rename from drivers/net/igbvf/regs.h
rename to drivers/net/intel_wired_lan/igbvf/regs.h
drivers/net/intel_wired_lan/igbvf/vf.c renamed from drivers/net/igbvf/vf.c +0 -0
similarity index 100%
rename from drivers/net/igbvf/vf.c
rename to drivers/net/intel_wired_lan/igbvf/vf.c
drivers/net/intel_wired_lan/igbvf/vf.h renamed from drivers/net/igbvf/vf.h +0 -0
similarity index 100%
rename from drivers/net/igbvf/vf.h
rename to drivers/net/intel_wired_lan/igbvf/vf.h
drivers/net/intel_wired_lan/ixgb/Makefile renamed from drivers/net/ixgb/Makefile +0 -0
similarity index 100%
rename from drivers/net/ixgb/Makefile
rename to drivers/net/intel_wired_lan/ixgb/Makefile
drivers/net/intel_wired_lan/ixgb/ixgb.h renamed from drivers/net/ixgb/ixgb.h +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb.h
drivers/net/intel_wired_lan/ixgb/ixgb_ee.c renamed from drivers/net/ixgb/ixgb_ee.c +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_ee.c
rename to drivers/net/intel_wired_lan/ixgb/ixgb_ee.c
drivers/net/intel_wired_lan/ixgb/ixgb_ee.h renamed from drivers/net/ixgb/ixgb_ee.h +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_ee.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb_ee.h
drivers/net/intel_wired_lan/ixgb/ixgb_ethtool.c renamed from drivers/net/ixgb/ixgb_ethtool.c +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_ethtool.c
rename to drivers/net/intel_wired_lan/ixgb/ixgb_ethtool.c
drivers/net/intel_wired_lan/ixgb/ixgb_hw.c renamed from drivers/net/ixgb/ixgb_hw.c +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_hw.c
rename to drivers/net/intel_wired_lan/ixgb/ixgb_hw.c
drivers/net/intel_wired_lan/ixgb/ixgb_hw.h renamed from drivers/net/ixgb/ixgb_hw.h +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_hw.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb_hw.h
drivers/net/intel_wired_lan/ixgb/ixgb_ids.h renamed from drivers/net/ixgb/ixgb_ids.h +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_ids.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb_ids.h
drivers/net/intel_wired_lan/ixgb/ixgb_main.c renamed from drivers/net/ixgb/ixgb_main.c +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_main.c
rename to drivers/net/intel_wired_lan/ixgb/ixgb_main.c
drivers/net/intel_wired_lan/ixgb/ixgb_osdep.h renamed from drivers/net/ixgb/ixgb_osdep.h +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_osdep.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb_osdep.h
drivers/net/intel_wired_lan/ixgb/ixgb_param.c renamed from drivers/net/ixgb/ixgb_param.c +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_param.c
rename to drivers/net/intel_wired_lan/ixgb/ixgb_param.c
drivers/net/intel_wired_lan/ixgbe/Makefile renamed from drivers/net/ixgbe/Makefile +0 -0
similarity index 100%
rename from drivers/net/ixgbe/Makefile
rename to drivers/net/intel_wired_lan/ixgbe/Makefile
drivers/net/intel_wired_lan/ixgbe/ixgbe.h renamed from drivers/net/ixgbe/ixgbe.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_82598.c renamed from drivers/net/ixgbe/ixgbe_82598.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_82598.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_82598.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_82599.c renamed from drivers/net/ixgbe/ixgbe_82599.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_82599.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_82599.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_common.c renamed from drivers/net/ixgbe/ixgbe_common.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_common.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_common.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_common.h renamed from drivers/net/ixgbe/ixgbe_common.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_common.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_common.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.c renamed from drivers/net/ixgbe/ixgbe_dcb.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.h renamed from drivers/net/ixgbe/ixgbe_dcb.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.c renamed from drivers/net/ixgbe/ixgbe_dcb_82598.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82598.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.h renamed from drivers/net/ixgbe/ixgbe_dcb_82598.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82598.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.c renamed from drivers/net/ixgbe/ixgbe_dcb_82599.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82599.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.h renamed from drivers/net/ixgbe/ixgbe_dcb_82599.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82599.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_nl.c renamed from drivers/net/ixgbe/ixgbe_dcb_nl.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_nl.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_nl.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_ethtool.c renamed from drivers/net/ixgbe/ixgbe_ethtool.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_ethtool.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_ethtool.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.c renamed from drivers/net/ixgbe/ixgbe_fcoe.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_fcoe.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.h renamed from drivers/net/ixgbe/ixgbe_fcoe.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_fcoe.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_main.c renamed from drivers/net/ixgbe/ixgbe_main.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_main.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_main.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.c renamed from drivers/net/ixgbe/ixgbe_mbx.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_mbx.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.h renamed from drivers/net/ixgbe/ixgbe_mbx.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_mbx.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.c renamed from drivers/net/ixgbe/ixgbe_phy.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_phy.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.h renamed from drivers/net/ixgbe/ixgbe_phy.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_phy.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.c renamed from drivers/net/ixgbe/ixgbe_sriov.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_sriov.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.h renamed from drivers/net/ixgbe/ixgbe_sriov.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_sriov.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_type.h renamed from drivers/net/ixgbe/ixgbe_type.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_type.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_type.h
drivers/net/intel_wired_lan/ixgbevf/Makefile renamed from drivers/net/ixgbevf/Makefile +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/Makefile
rename to drivers/net/intel_wired_lan/ixgbevf/Makefile
drivers/net/intel_wired_lan/ixgbevf/defines.h renamed from drivers/net/ixgbevf/defines.h +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/defines.h
rename to drivers/net/intel_wired_lan/ixgbevf/defines.h
drivers/net/intel_wired_lan/ixgbevf/ethtool.c renamed from drivers/net/ixgbevf/ethtool.c +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/ethtool.c
rename to drivers/net/intel_wired_lan/ixgbevf/ethtool.c
drivers/net/intel_wired_lan/ixgbevf/ixgbevf.h renamed from drivers/net/ixgbevf/ixgbevf.h +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/ixgbevf.h
rename to drivers/net/intel_wired_lan/ixgbevf/ixgbevf.h
drivers/net/intel_wired_lan/ixgbevf/ixgbevf_main.c renamed from drivers/net/ixgbevf/ixgbevf_main.c +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/ixgbevf_main.c
rename to drivers/net/intel_wired_lan/ixgbevf/ixgbevf_main.c
drivers/net/intel_wired_lan/ixgbevf/mbx.c renamed from drivers/net/ixgbevf/mbx.c +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/mbx.c
rename to drivers/net/intel_wired_lan/ixgbevf/mbx.c
drivers/net/intel_wired_lan/ixgbevf/mbx.h renamed from drivers/net/ixgbevf/mbx.h +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/mbx.h
rename to drivers/net/intel_wired_lan/ixgbevf/mbx.h
drivers/net/intel_wired_lan/ixgbevf/regs.h renamed from drivers/net/ixgbevf/regs.h +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/regs.h
rename to drivers/net/intel_wired_lan/ixgbevf/regs.h
drivers/net/intel_wired_lan/ixgbevf/vf.c renamed from drivers/net/ixgbevf/vf.c +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/vf.c
rename to drivers/net/intel_wired_lan/ixgbevf/vf.c
drivers/net/intel_wired_lan/ixgbevf/vf.h renamed from drivers/net/ixgbevf/vf.h +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/vf.h
rename to drivers/net/intel_wired_lan/ixgbevf/vf.h

Seems like it would introduce more confusion and trouble.

Signature · 11 lines
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1,  ECMAScript5, and DOM L2 & L3.
Spend less time writing and  rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired
#2 lore raw
Quoted 7 lines · Stephen Hemminger
Quoted 4 lines · On Sun, 10 Oct 2010 13:42:32 -0700 Joe Perches <[email protected]> wrote:

Perhaps it's better to move drivers from the very populated drivers/net directory into vendor specific directories similar to the Atheros approach used for drivers/net/wireless/ath/ Move intel drivers and Documentation to separate directories

Seems like it would introduce more confusion and trouble.

It would also allow common code to be consolidated from the various drivers.

------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired

#3 lore raw
In reply to Joe Perches
Quoted 112 lines · Joe Perches

Perhaps it's better to move drivers from the very populated drivers/net directory into vendor specific directories similar to the Atheros approach used for drivers/net/wireless/ath/

Move intel drivers and Documentation to separate directories Create drivers/net/intel_wired_lan/Kconfig.<speed> and Makefile Modify drivers/net/Kconfig and Makefile
Update MAINTAINERS

---
 .../networking/{ => intel_wired_lan}/e100.txt      |    0 .../networking/{ => intel_wired_lan}/e1000.txt     |    0 .../networking/{ => intel_wired_lan}/igb.txt       |    0 .../networking/{ => intel_wired_lan}/igbvf.txt     |    0 .../networking/{ => intel_wired_lan}/ixgb.txt      |    0 .../networking/{ => intel_wired_lan}/ixgbe.txt     |    0 .../networking/{ => intel_wired_lan}/ixgbevf.txt   |    0 MAINTAINERS                                        |   18 +-- drivers/net/Kconfig                                |  214 +------------------- drivers/net/Makefile                               |    8 - drivers/net/intel_wired_lan/Kconfig.100            |   25 +++ drivers/net/intel_wired_lan/Kconfig.1000           |  102 ++++++++++ drivers/net/intel_wired_lan/Kconfig.10000          |   81 ++++++++ drivers/net/intel_wired_lan/Makefile               |    9 + drivers/net/{ => intel_wired_lan}/e100.c           |    0 drivers/net/{ => intel_wired_lan}/e1000/Makefile   |    0 drivers/net/{ => intel_wired_lan}/e1000/e1000.h    |    0
 .../{ => intel_wired_lan}/e1000/e1000_ethtool.c    |    0 drivers/net/{ => intel_wired_lan}/e1000/e1000_hw.c |    0 drivers/net/{ => intel_wired_lan}/e1000/e1000_hw.h |    0

 .../net/{ => intel_wired_lan}/e1000/e1000_main.c   |    0
 .../net/{ => intel_wired_lan}/e1000/e1000_osdep.h  |    0
 .../net/{ => intel_wired_lan}/e1000/e1000_param.c  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/82571.c   |    0
 drivers/net/{ => intel_wired_lan}/e1000e/Makefile  |    0

 drivers/net/{ => intel_wired_lan}/e1000e/defines.h |    0 drivers/net/{ => intel_wired_lan}/e1000e/e1000.h   |    0 drivers/net/{ => intel_wired_lan}/e1000e/es2lan.c  |    0 drivers/net/{ => intel_wired_lan}/e1000e/ethtool.c |    0 drivers/net/{ => intel_wired_lan}/e1000e/hw.h      |    0 drivers/net/{ => intel_wired_lan}/e1000e/ich8lan.c |    0 drivers/net/{ => intel_wired_lan}/e1000e/lib.c     |    0 drivers/net/{ => intel_wired_lan}/e1000e/netdev.c  |    0 drivers/net/{ => intel_wired_lan}/e1000e/param.c   |    0

 drivers/net/{ => intel_wired_lan}/e1000e/phy.c     |    0
 drivers/net/{ => intel_wired_lan}/igb/Makefile     |    0
 .../net/{ => intel_wired_lan}/igb/e1000_82575.c    |    0
 .../net/{ => intel_wired_lan}/igb/e1000_82575.h    |    0
 .../net/{ => intel_wired_lan}/igb/e1000_defines.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_hw.h   |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mac.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mac.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mbx.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mbx.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_nvm.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_nvm.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_phy.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_phy.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_regs.h |    0
 drivers/net/{ => intel_wired_lan}/igb/igb.h        |    0
 .../net/{ => intel_wired_lan}/igb/igb_ethtool.c    |    0
 drivers/net/{ => intel_wired_lan}/igb/igb_main.c   |    0
 drivers/net/{ => intel_wired_lan}/igbvf/Makefile   |    0
 drivers/net/{ => intel_wired_lan}/igbvf/defines.h  |    0
 drivers/net/{ => intel_wired_lan}/igbvf/ethtool.c  |    0

 drivers/net/{ => intel_wired_lan}/igbvf/igbvf.h    |    0 drivers/net/{ => intel_wired_lan}/igbvf/mbx.c      |    0 drivers/net/{ => intel_wired_lan}/igbvf/mbx.h      |    0 drivers/net/{ => intel_wired_lan}/igbvf/netdev.c   |    0 drivers/net/{ => intel_wired_lan}/igbvf/regs.h     |    0 drivers/net/{ => intel_wired_lan}/igbvf/vf.c       |    0 drivers/net/{ => intel_wired_lan}/igbvf/vf.h       |    0 drivers/net/{ => intel_wired_lan}/ixgb/Makefile    |    0 drivers/net/{ => intel_wired_lan}/ixgb/ixgb.h      |    0

 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_ee.c   |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_ee.h   |    0
 .../net/{ => intel_wired_lan}/ixgb/ixgb_ethtool.c  |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_hw.c   |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_hw.h   |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_ids.h  |    0

 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_main.c |    0 .../net/{ => intel_wired_lan}/ixgb/ixgb_osdep.h    |    0 .../net/{ => intel_wired_lan}/ixgb/ixgb_param.c    |    0 drivers/net/{ => intel_wired_lan}/ixgbe/Makefile   |    0 drivers/net/{ => intel_wired_lan}/ixgbe/ixgbe.h    |    0 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_82598.c  |    0 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_82599.c  |    0 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_common.c |    0 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_common.h |    0 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_dcb.c    |    0 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_dcb.h    |    0

 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82598.c  |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82598.h  |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82599.c  |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82599.h  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_dcb_nl.c |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_ethtool.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_fcoe.c   |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_fcoe.h   |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_main.c   |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_mbx.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_mbx.h    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_phy.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_phy.h    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_sriov.c  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_sriov.h  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_type.h   |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/Makefile |    0
 .../net/{ => intel_wired_lan}/ixgbevf/defines.h    |    0
 .../net/{ => intel_wired_lan}/ixgbevf/ethtool.c    |    0
 .../net/{ => intel_wired_lan}/ixgbevf/ixgbevf.h    |    0
Quoted 8 lines

 .../{ => intel_wired_lan}/ixgbevf/ixgbevf_main.c   |    0 drivers/net/{ => intel_wired_lan}/ixgbevf/mbx.c    |    0 drivers/net/{ => intel_wired_lan}/ixgbevf/mbx.h    |    0 drivers/net/{ => intel_wired_lan}/ixgbevf/regs.h   |    0 drivers/net/{ => intel_wired_lan}/ixgbevf/vf.c     |    0 drivers/net/{ => intel_wired_lan}/ixgbevf/vf.h     |    0

 107 files changed, 224 insertions(+), 233 deletions(-)

NAK
I agree with Stephen that this will generate a lot of confusion and....

First, I think we need to keep the documentation in /Documentation/networking. Second, the changes are extensive and would create a lot of regression testing.

We have been looking at solutions like this for future drivers/hardware and is on the list of items we are currently working on, but feel it should not be made retroactively due to the regression testing and massive changes that would need to be made.

Signature · 14 lines
Cheers,
Jeff

------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1,  ECMAScript5, and DOM L2 & L3.
Spend less time writing and  rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired
#4 lore raw
Quoted 7 lines · Jeff Kirsher
Quoted 3 lines · Joe Perches

Perhaps it's better to move drivers from the very populated drivers/net directory into vendor specific directories similar to the Atheros approach used for drivers/net/wireless/ath/

NAK
First, I think we need to keep the documentation in /Documentation/networking. Second, the changes are extensive and would create a lot of regression testing.

I don't see any actual changes here other than layout. What kind of regression testing do you think necessary?

Quoted 4 lines

We have been looking at solutions like this for future drivers/hardware and is on the list of items we are currently working on, but feel it should not be made retroactively due to the regression testing and massive changes that would need to be made.

Might as well start somewhere.

------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired

#5 lore raw
Quoted 10 lines · Joe Perches
Quoted 7 lines · Jeff Kirsher
Quoted 3 lines · Joe Perches

Perhaps it's better to move drivers from the very populated drivers/net directory into vendor specific directories similar to the Atheros approach used for drivers/net/wireless/ath/

NAK
First, I think we need to keep the documentation in /Documentation/networking. Second, the changes are extensive and would create a lot of regression testing.

I don't see any actual changes here other than layout. What kind of regression testing do you think necessary?

Jeff?

What regression testing would actually be done?

Any new objects are trivially validated against existing objects.

Quoted 6 lines
Quoted 4 lines

We have been looking at solutions like this for future drivers/hardware and is on the list of items we are currently working on, but feel it should not be made retroactively due to the regression testing and massive changes that would need to be made.

Might as well start somewhere.

------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired

#6 lore raw
Quoted 6 lines · Joe Perches
Quoted 5 lines · Joe Perches
Quoted 4 lines · Jeff Kirsher
Quoted 3 lines · Joe Perches

Perhaps it's better to move drivers from the very populated drivers/net directory into vendor specific directories similar to the Atheros approach used for drivers/net/wireless/ath/

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

NAK
First, I think we need to keep the documentation in /Documentation/networking. Second, the changes are extensive and would create a lot of regression testing.

I don't see any actual changes here other than layout. What kind of regression testing do you think necessary?

Jeff?

Sorry I am not ignoring you, I was taking a closer look at your patch.

Quoted 2 lines

What regression testing would actually be done?

The Makefile and Kconfig needs more work. I applied your patch and none of the Intel Wired drivers build.

The statement that there would be a lot of regression testing was in reference to your response to Stephen that it would "allow consolidation of common code". Sorry for being vague about the regression testing.

In general, I do like the idea of moving all the Intel wired LAN drivers into their own directory, like was Atheros has done in Wireless.

I am working on providing an updated RFC patch to resolve the Makefile/Kconfig issues I found and few other minor issues I have found.

Quoted 9 lines

Any new objects are trivially validated against existing objects.

Quoted 6 lines
Quoted 4 lines

We have been looking at solutions like this for future drivers/hardware and is on the list of items we are currently working on, but feel it should not be made retroactively due to the regression testing and massive changes that would need to be made.

Might as well start somewhere.

#7 lore raw
Quoted 5 lines · Jeff Kirsher

On Wed, 2010-10-13 at 15:28 -0700, Joe Perches wrote:
Sorry I am not ignoring you, I was taking a closer look at your patch.

Quoted 1 line

What regression testing would actually be done?

The Makefile and Kconfig needs more work. I applied your patch and none of the Intel Wired drivers build.

Care to describe the Makefile/Kconfig issues you have seen?

I built it allyesconfig, defconfig, allmodconfig and allnoconfig.

Perhaps you need to use "git am foo" in a test branch instead of "patch -p1 < foo" ?

Quoted 3 lines

I am working on providing an updated RFC patch to resolve the Makefile/Kconfig issues I found and few other minor issues I have found.

Oh good.

cheers, Joe

#8 lore raw
Quoted 10 lines · Joe Perches
Quoted 5 lines · Jeff Kirsher

On Wed, 2010-10-13 at 15:28 -0700, Joe Perches wrote:
Sorry I am not ignoring you, I was taking a closer look at your patch.

Quoted 1 line

What regression testing would actually be done?

The Makefile and Kconfig needs more work. I applied your patch and none of the Intel Wired drivers build.

Care to describe the Makefile/Kconfig issues you have seen?

I built it allyesconfig, defconfig, allmodconfig and allnoconfig.

Yeah, I found all of those built without errors, but if you build the Intel Wired LAN drivers as modules, you will not find the *.ko files after the build. The Kconfig files look fine, the problem was with the Makefiles. Instead of creating a drivers/net/intel_wired_lan/Makefile, I simply changed the path in drivers/net/Makefile to the updated path and that resolved the issue.

Also I found that you missed moving e1000e.txt.

As far as the sub-directory name "intel_wired_lan", what about "intel" or "intel_wired"? Just a thought...

Quoted 3 lines

Perhaps you need to use "git am foo" in a test branch instead of "patch -p1 < foo" ?

I used "git am foo"...

Quoted 9 lines
Quoted 4 lines

I am working on providing an updated RFC patch to resolve the Makefile/Kconfig issues I found and few other minor issues I have found.

Oh good.

cheers, Joe

Here is the updated patch (also attached)...

Documentation/networking drivers/net: Create directory intel_wired_lan

Based on original patch from Joe Perches <[email protected]>

Move intel drivers and Documentation to separate directories Create drivers/net/intel_wired_lan/Kconfig.<speed> and Makefile Modify drivers/net/Kconfig and Makefile
Update MAINTAINERS

---
 .../networking/{ => intel_wired_lan}/e100.txt      |    0
 .../networking/{ => intel_wired_lan}/e1000.txt     |    0
 .../networking/{ => intel_wired_lan}/e1000e.txt    |    0
 .../networking/{ => intel_wired_lan}/igb.txt       |    0
 .../networking/{ => intel_wired_lan}/igbvf.txt     |    0
 .../networking/{ => intel_wired_lan}/ixgb.txt      |    0
 .../networking/{ => intel_wired_lan}/ixgbe.txt     |    0
 .../networking/{ => intel_wired_lan}/ixgbevf.txt   |    0
 MAINTAINERS                                        |   18 +--
 drivers/net/Kconfig                                |  214
+-------------------
 drivers/net/Makefile                               |   16 +-
 drivers/net/intel_wired_lan/Kconfig.100            |   25 +++
 drivers/net/intel_wired_lan/Kconfig.1000           |  102 ++++++++++
 drivers/net/intel_wired_lan/Kconfig.10000          |   81 ++++++++
 drivers/net/{ => intel_wired_lan}/e100.c           |    0
 drivers/net/{ => intel_wired_lan}/e1000/Makefile   |    0
 drivers/net/{ => intel_wired_lan}/e1000/e1000.h    |    0
 .../{ => intel_wired_lan}/e1000/e1000_ethtool.c    |    0
 drivers/net/{ => intel_wired_lan}/e1000/e1000_hw.c |    0
 drivers/net/{ => intel_wired_lan}/e1000/e1000_hw.h |    0
 .../net/{ => intel_wired_lan}/e1000/e1000_main.c   |    0
 .../net/{ => intel_wired_lan}/e1000/e1000_osdep.h  |    0
 .../net/{ => intel_wired_lan}/e1000/e1000_param.c  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/82571.c   |    0
 drivers/net/{ => intel_wired_lan}/e1000e/Makefile  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/defines.h |    0
 drivers/net/{ => intel_wired_lan}/e1000e/e1000.h   |    0
 drivers/net/{ => intel_wired_lan}/e1000e/es2lan.c  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/ethtool.c |    0
 drivers/net/{ => intel_wired_lan}/e1000e/hw.h      |    0
 drivers/net/{ => intel_wired_lan}/e1000e/ich8lan.c |    0
 drivers/net/{ => intel_wired_lan}/e1000e/lib.c     |    0
 drivers/net/{ => intel_wired_lan}/e1000e/netdev.c  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/param.c   |    0
 drivers/net/{ => intel_wired_lan}/e1000e/phy.c     |    0
 drivers/net/{ => intel_wired_lan}/igb/Makefile     |    0
 .../net/{ => intel_wired_lan}/igb/e1000_82575.c    |    0
 .../net/{ => intel_wired_lan}/igb/e1000_82575.h    |    0
 .../net/{ => intel_wired_lan}/igb/e1000_defines.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_hw.h   |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mac.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mac.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mbx.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mbx.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_nvm.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_nvm.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_phy.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_phy.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_regs.h |    0
 drivers/net/{ => intel_wired_lan}/igb/igb.h        |    0
 .../net/{ => intel_wired_lan}/igb/igb_ethtool.c    |    0
 drivers/net/{ => intel_wired_lan}/igb/igb_main.c   |    0
 drivers/net/{ => intel_wired_lan}/igbvf/Makefile   |    0
 drivers/net/{ => intel_wired_lan}/igbvf/defines.h  |    0
 drivers/net/{ => intel_wired_lan}/igbvf/ethtool.c  |    0
 drivers/net/{ => intel_wired_lan}/igbvf/igbvf.h    |    0
 drivers/net/{ => intel_wired_lan}/igbvf/mbx.c      |    0
 drivers/net/{ => intel_wired_lan}/igbvf/mbx.h      |    0
 drivers/net/{ => intel_wired_lan}/igbvf/netdev.c   |    0
 drivers/net/{ => intel_wired_lan}/igbvf/regs.h     |    0
 drivers/net/{ => intel_wired_lan}/igbvf/vf.c       |    0
 drivers/net/{ => intel_wired_lan}/igbvf/vf.h       |    0
 drivers/net/{ => intel_wired_lan}/ixgb/Makefile    |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb.h      |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_ee.c   |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_ee.h   |    0
 .../net/{ => intel_wired_lan}/ixgb/ixgb_ethtool.c  |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_hw.c   |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_hw.h   |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_ids.h  |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_main.c |    0
 .../net/{ => intel_wired_lan}/ixgb/ixgb_osdep.h    |    0
 .../net/{ => intel_wired_lan}/ixgb/ixgb_param.c    |    0
 drivers/net/{ => intel_wired_lan}/ixgbe/Makefile   |    0
 drivers/net/{ => intel_wired_lan}/ixgbe/ixgbe.h    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_82598.c  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_82599.c  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_common.c |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_common.h |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_dcb.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_dcb.h    |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82598.c  |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82598.h  |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82599.c  |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82599.h  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_dcb_nl.c |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_ethtool.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_fcoe.c   |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_fcoe.h   |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_main.c   |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_mbx.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_mbx.h    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_phy.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_phy.h    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_sriov.c  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_sriov.h  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_type.h   |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/Makefile |    0
 .../net/{ => intel_wired_lan}/ixgbevf/defines.h    |    0
 .../net/{ => intel_wired_lan}/ixgbevf/ethtool.c    |    0
 .../net/{ => intel_wired_lan}/ixgbevf/ixgbevf.h    |    0
 .../{ => intel_wired_lan}/ixgbevf/ixgbevf_main.c   |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/mbx.c    |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/mbx.h    |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/regs.h   |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/vf.c     |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/vf.h     |    0
 107 files changed, 224 insertions(+), 233 deletions(-)
drivers/net/intel_wired_lan/e100.c renamed from drivers/net/e100.c +0 -0
similarity index 100%
rename from drivers/net/e100.c
rename to drivers/net/intel_wired_lan/e100.c
(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000/Makefile similarity index 100%
rename from drivers/net/e1000/Makefile rename to drivers/net/intel_wired_lan/e1000/Makefile

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000/e1000.h similarity index 100%
rename from drivers/net/e1000/e1000.h rename to drivers/net/intel_wired_lan/e1000/e1000.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000/e1000_ethtool.c similarity index 100%
rename from drivers/net/e1000/e1000_ethtool.c rename to drivers/net/intel_wired_lan/e1000/e1000_ethtool.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000/e1000_hw.c similarity index 100%
rename from drivers/net/e1000/e1000_hw.c rename to drivers/net/intel_wired_lan/e1000/e1000_hw.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000/e1000_hw.h similarity index 100%
rename from drivers/net/e1000/e1000_hw.h rename to drivers/net/intel_wired_lan/e1000/e1000_hw.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000/e1000_main.c similarity index 100%
rename from drivers/net/e1000/e1000_main.c rename to drivers/net/intel_wired_lan/e1000/e1000_main.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000/e1000_osdep.h similarity index 100%
rename from drivers/net/e1000/e1000_osdep.h rename to drivers/net/intel_wired_lan/e1000/e1000_osdep.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000/e1000_param.c similarity index 100%
rename from drivers/net/e1000/e1000_param.c rename to drivers/net/intel_wired_lan/e1000/e1000_param.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000e/82571.c similarity index 100%
rename from drivers/net/e1000e/82571.c rename to drivers/net/intel_wired_lan/e1000e/82571.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000e/Makefile similarity index 100%
rename from drivers/net/e1000e/Makefile rename to drivers/net/intel_wired_lan/e1000e/Makefile

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000e/defines.h similarity index 100%
rename from drivers/net/e1000e/defines.h rename to drivers/net/intel_wired_lan/e1000e/defines.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000e/e1000.h similarity index 100%
rename from drivers/net/e1000e/e1000.h rename to drivers/net/intel_wired_lan/e1000e/e1000.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000e/es2lan.c similarity index 100%
rename from drivers/net/e1000e/es2lan.c rename to drivers/net/intel_wired_lan/e1000e/es2lan.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000e/ethtool.c similarity index 100%
rename from drivers/net/e1000e/ethtool.c rename to drivers/net/intel_wired_lan/e1000e/ethtool.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000e/hw.h
similarity index 100%
rename from drivers/net/e1000e/hw.h
rename to drivers/net/intel_wired_lan/e1000e/hw.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000e/ich8lan.c similarity index 100%
rename from drivers/net/e1000e/ich8lan.c rename to drivers/net/intel_wired_lan/e1000e/ich8lan.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000e/lib.c similarity index 100%
rename from drivers/net/e1000e/lib.c rename to drivers/net/intel_wired_lan/e1000e/lib.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000e/netdev.c similarity index 100%
rename from drivers/net/e1000e/netdev.c rename to drivers/net/intel_wired_lan/e1000e/netdev.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000e/param.c similarity index 100%
rename from drivers/net/e1000e/param.c rename to drivers/net/intel_wired_lan/e1000e/param.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/e1000e/phy.c similarity index 100%
rename from drivers/net/e1000e/phy.c rename to drivers/net/intel_wired_lan/e1000e/phy.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/Makefile similarity index 100%
rename from drivers/net/igb/Makefile rename to drivers/net/intel_wired_lan/igb/Makefile

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/e1000_82575.c similarity index 100%
rename from drivers/net/igb/e1000_82575.c rename to drivers/net/intel_wired_lan/igb/e1000_82575.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/e1000_82575.h similarity index 100%
rename from drivers/net/igb/e1000_82575.h rename to drivers/net/intel_wired_lan/igb/e1000_82575.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/e1000_defines.h similarity index 100%
rename from drivers/net/igb/e1000_defines.h rename to drivers/net/intel_wired_lan/igb/e1000_defines.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/e1000_hw.h similarity index 100%
rename from drivers/net/igb/e1000_hw.h rename to drivers/net/intel_wired_lan/igb/e1000_hw.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/e1000_mac.c similarity index 100%
rename from drivers/net/igb/e1000_mac.c rename to drivers/net/intel_wired_lan/igb/e1000_mac.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/e1000_mac.h similarity index 100%
rename from drivers/net/igb/e1000_mac.h rename to drivers/net/intel_wired_lan/igb/e1000_mac.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/e1000_mbx.c similarity index 100%
rename from drivers/net/igb/e1000_mbx.c rename to drivers/net/intel_wired_lan/igb/e1000_mbx.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/e1000_mbx.h similarity index 100%
rename from drivers/net/igb/e1000_mbx.h rename to drivers/net/intel_wired_lan/igb/e1000_mbx.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/e1000_nvm.c similarity index 100%
rename from drivers/net/igb/e1000_nvm.c rename to drivers/net/intel_wired_lan/igb/e1000_nvm.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/e1000_nvm.h similarity index 100%
rename from drivers/net/igb/e1000_nvm.h rename to drivers/net/intel_wired_lan/igb/e1000_nvm.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/e1000_phy.c similarity index 100%
rename from drivers/net/igb/e1000_phy.c rename to drivers/net/intel_wired_lan/igb/e1000_phy.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/e1000_phy.h similarity index 100%
rename from drivers/net/igb/e1000_phy.h rename to drivers/net/intel_wired_lan/igb/e1000_phy.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/e1000_regs.h similarity index 100%
rename from drivers/net/igb/e1000_regs.h rename to drivers/net/intel_wired_lan/igb/e1000_regs.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/igb.h
similarity index 100%
rename from drivers/net/igb/igb.h
rename to drivers/net/intel_wired_lan/igb/igb.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/igb_ethtool.c similarity index 100%
rename from drivers/net/igb/igb_ethtool.c rename to drivers/net/intel_wired_lan/igb/igb_ethtool.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igb/igb_main.c similarity index 100%
rename from drivers/net/igb/igb_main.c rename to drivers/net/intel_wired_lan/igb/igb_main.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igbvf/Makefile similarity index 100%
rename from drivers/net/igbvf/Makefile rename to drivers/net/intel_wired_lan/igbvf/Makefile

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igbvf/defines.h similarity index 100%
rename from drivers/net/igbvf/defines.h rename to drivers/net/intel_wired_lan/igbvf/defines.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igbvf/ethtool.c similarity index 100%
rename from drivers/net/igbvf/ethtool.c rename to drivers/net/intel_wired_lan/igbvf/ethtool.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igbvf/igbvf.h similarity index 100%
rename from drivers/net/igbvf/igbvf.h rename to drivers/net/intel_wired_lan/igbvf/igbvf.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igbvf/mbx.c
similarity index 100%
rename from drivers/net/igbvf/mbx.c
rename to drivers/net/intel_wired_lan/igbvf/mbx.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igbvf/mbx.h
similarity index 100%
rename from drivers/net/igbvf/mbx.h
rename to drivers/net/intel_wired_lan/igbvf/mbx.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igbvf/netdev.c similarity index 100%
rename from drivers/net/igbvf/netdev.c rename to drivers/net/intel_wired_lan/igbvf/netdev.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igbvf/regs.h similarity index 100%
rename from drivers/net/igbvf/regs.h rename to drivers/net/intel_wired_lan/igbvf/regs.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igbvf/vf.c
similarity index 100%
rename from drivers/net/igbvf/vf.c
rename to drivers/net/intel_wired_lan/igbvf/vf.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/igbvf/vf.h
similarity index 100%
rename from drivers/net/igbvf/vf.h
rename to drivers/net/intel_wired_lan/igbvf/vf.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgb/Makefile similarity index 100%
rename from drivers/net/ixgb/Makefile rename to drivers/net/intel_wired_lan/ixgb/Makefile

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgb/ixgb.h
similarity index 100%
rename from drivers/net/ixgb/ixgb.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgb/ixgb_ee.c similarity index 100%
rename from drivers/net/ixgb/ixgb_ee.c rename to drivers/net/intel_wired_lan/ixgb/ixgb_ee.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgb/ixgb_ee.h similarity index 100%
rename from drivers/net/ixgb/ixgb_ee.h rename to drivers/net/intel_wired_lan/ixgb/ixgb_ee.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgb/ixgb_ethtool.c similarity index 100%
rename from drivers/net/ixgb/ixgb_ethtool.c rename to drivers/net/intel_wired_lan/ixgb/ixgb_ethtool.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgb/ixgb_hw.c similarity index 100%
rename from drivers/net/ixgb/ixgb_hw.c rename to drivers/net/intel_wired_lan/ixgb/ixgb_hw.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgb/ixgb_hw.h similarity index 100%
rename from drivers/net/ixgb/ixgb_hw.h rename to drivers/net/intel_wired_lan/ixgb/ixgb_hw.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgb/ixgb_ids.h similarity index 100%
rename from drivers/net/ixgb/ixgb_ids.h rename to drivers/net/intel_wired_lan/ixgb/ixgb_ids.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgb/ixgb_main.c similarity index 100%
rename from drivers/net/ixgb/ixgb_main.c rename to drivers/net/intel_wired_lan/ixgb/ixgb_main.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgb/ixgb_osdep.h similarity index 100%
rename from drivers/net/ixgb/ixgb_osdep.h rename to drivers/net/intel_wired_lan/ixgb/ixgb_osdep.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgb/ixgb_param.c similarity index 100%
rename from drivers/net/ixgb/ixgb_param.c rename to drivers/net/intel_wired_lan/ixgb/ixgb_param.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/Makefile similarity index 100%
rename from drivers/net/ixgbe/Makefile rename to drivers/net/intel_wired_lan/ixgbe/Makefile

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe.h similarity index 100%
rename from drivers/net/ixgbe/ixgbe.h rename to drivers/net/intel_wired_lan/ixgbe/ixgbe.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_82598.c similarity index 100%
rename from drivers/net/ixgbe/ixgbe_82598.c rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_82598.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_82599.c similarity index 100%
rename from drivers/net/ixgbe/ixgbe_82599.c rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_82599.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_common.c similarity index 100%
rename from drivers/net/ixgbe/ixgbe_common.c rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_common.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_common.h similarity index 100%
rename from drivers/net/ixgbe/ixgbe_common.h rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_common.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.c similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb.c rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.h similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb.h rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.c similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82598.c rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.h similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82598.h rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.c similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82599.c rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.h similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82599.h rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_nl.c similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_nl.c rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_nl.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_ethtool.c similarity index 100%
rename from drivers/net/ixgbe/ixgbe_ethtool.c rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_ethtool.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.c similarity index 100%
rename from drivers/net/ixgbe/ixgbe_fcoe.c rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.h similarity index 100%
rename from drivers/net/ixgbe/ixgbe_fcoe.h rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_main.c similarity index 100%
rename from drivers/net/ixgbe/ixgbe_main.c rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_main.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.c similarity index 100%
rename from drivers/net/ixgbe/ixgbe_mbx.c rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.h similarity index 100%
rename from drivers/net/ixgbe/ixgbe_mbx.h rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.c similarity index 100%
rename from drivers/net/ixgbe/ixgbe_phy.c rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.h similarity index 100%
rename from drivers/net/ixgbe/ixgbe_phy.h rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.c similarity index 100%
rename from drivers/net/ixgbe/ixgbe_sriov.c rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.h similarity index 100%
rename from drivers/net/ixgbe/ixgbe_sriov.h rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbe/ixgbe_type.h similarity index 100%
rename from drivers/net/ixgbe/ixgbe_type.h rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_type.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbevf/Makefile similarity index 100%
rename from drivers/net/ixgbevf/Makefile rename to drivers/net/intel_wired_lan/ixgbevf/Makefile

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbevf/defines.h similarity index 100%
rename from drivers/net/ixgbevf/defines.h rename to drivers/net/intel_wired_lan/ixgbevf/defines.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbevf/ethtool.c similarity index 100%
rename from drivers/net/ixgbevf/ethtool.c rename to drivers/net/intel_wired_lan/ixgbevf/ethtool.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbevf/ixgbevf.h similarity index 100%
rename from drivers/net/ixgbevf/ixgbevf.h rename to drivers/net/intel_wired_lan/ixgbevf/ixgbevf.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbevf/ixgbevf_main.c similarity index 100%
rename from drivers/net/ixgbevf/ixgbevf_main.c rename to drivers/net/intel_wired_lan/ixgbevf/ixgbevf_main.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbevf/mbx.c similarity index 100%
rename from drivers/net/ixgbevf/mbx.c rename to drivers/net/intel_wired_lan/ixgbevf/mbx.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbevf/mbx.h similarity index 100%
rename from drivers/net/ixgbevf/mbx.h rename to drivers/net/intel_wired_lan/ixgbevf/mbx.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbevf/regs.h similarity index 100%
rename from drivers/net/ixgbevf/regs.h rename to drivers/net/intel_wired_lan/ixgbevf/regs.h

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbevf/vf.c similarity index 100%
rename from drivers/net/ixgbevf/vf.c rename to drivers/net/intel_wired_lan/ixgbevf/vf.c

(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/ixgbevf/vf.h similarity index 100%
rename from drivers/net/ixgbevf/vf.h rename to drivers/net/intel_wired_lan/ixgbevf/vf.h

(quoted diff) +0 -0

b/Documentation/networking/intel_wired_lan/e100.txt similarity index 100%
rename from Documentation/networking/e100.txt rename to Documentation/networking/intel_wired_lan/e100.txt

(quoted diff) +0 -0

b/Documentation/networking/intel_wired_lan/e1000.txt similarity index 100%
rename from Documentation/networking/e1000.txt rename to Documentation/networking/intel_wired_lan/e1000.txt

(quoted diff) +0 -0

b/Documentation/networking/intel_wired_lan/e1000e.txt similarity index 100%
rename from Documentation/networking/e1000e.txt rename to Documentation/networking/intel_wired_lan/e1000e.txt

(quoted diff) +0 -0

b/Documentation/networking/intel_wired_lan/igb.txt similarity index 100%
rename from Documentation/networking/igb.txt rename to Documentation/networking/intel_wired_lan/igb.txt

(quoted diff) +0 -0

b/Documentation/networking/intel_wired_lan/igbvf.txt similarity index 100%
rename from Documentation/networking/igbvf.txt rename to Documentation/networking/intel_wired_lan/igbvf.txt

(quoted diff) +0 -0

b/Documentation/networking/intel_wired_lan/ixgb.txt similarity index 100%
rename from Documentation/networking/ixgb.txt rename to Documentation/networking/intel_wired_lan/ixgb.txt

(quoted diff) +0 -0

b/Documentation/networking/intel_wired_lan/ixgbe.txt similarity index 100%
rename from Documentation/networking/ixgbe.txt rename to Documentation/networking/intel_wired_lan/ixgbe.txt

(quoted diff) +0 -0

b/Documentation/networking/intel_wired_lan/ixgbevf.txt similarity index 100%
rename from Documentation/networking/ixgbevf.txt rename to Documentation/networking/intel_wired_lan/ixgbevf.txt

MAINTAINERS +2 -16
index ba8603c..b086404 100644
@@ -3096,22 +3096,8 @@ M:	John Ronciak <[email protected]>
 L:	[email protected]
 W:	http://e1000.sourceforge.net/
 S:	Supported
-F:	Documentation/networking/e100.txt
-F:	Documentation/networking/e1000.txt
-F:	Documentation/networking/e1000e.txt
-F:	Documentation/networking/igb.txt
-F:	Documentation/networking/igbvf.txt
-F:	Documentation/networking/ixgb.txt
-F:	Documentation/networking/ixgbe.txt
-F:	Documentation/networking/ixgbevf.txt
-F:	drivers/net/e100.c
-F:	drivers/net/e1000/
-F:	drivers/net/e1000e/
-F:	drivers/net/igb/
-F:	drivers/net/igbvf/
-F:	drivers/net/ixgb/
-F:	drivers/net/ixgbe/
-F:	drivers/net/ixgbevf/
+F:	Documentation/networking/intel_wired_lan/
+F:	drivers/net/intel_wired_lan/
 
 INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
 L:	[email protected]
drivers/net/Kconfig +3 -67

91 lines not on this page · raw message

support"
- depends on PCI
- ---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:
-
- <http://support.intel.com>
-
- More specific information on configuring the driver is in
- <file:Documentation/networking/e1000.txt>.
-
- To compile this driver as a module, choose M here. The module
- will be called igb.
-
-config IGB_DCA
- bool "Direct Cache Access (DCA) Support"
- default y
- depends on IGB && DCA && !(IGB=y && DCA=m)
- ---help---

-	  Say Y here if you want to use Direct Cache Access (DCA) in the
-	  driver.  DCA is a method for warming the CPU cache before data
-	  is used, with the intent of lessening the impact of cache misses.
-
-config IGBVF
-       tristate "Intel(R) 82576 Virtual Function Ethernet support"
-       depends on PCI
-       ---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:
-
- <http://support.intel.com>
-
- More specific information on configuring the driver is in
- <file:Documentation/networking/e1000.txt>.
-
- To compile this driver as a module, choose M here. The module
- will be called igbvf.
-
source "drivers/net/ixp2000/Kconfig"

config MYRI_SBUS
@@ -2515,17 +2402,6 @@ config S6GMAC

source "drivers/net/stmmac/Kconfig"

-config PCH_GBE
- tristate "PCH Gigabit Ethernet"
- depends on PCI
- ---help---

-	  This is a gigabit ethernet driver for Topcliff PCH.
-	  Topcliff PCH is the platform controller hub that is used in Intel's
-	  general embedded platform.
-	  Topcliff PCH has Gigabit Ethernet interface.
-	  Using this interface, it is able to access system devices connected
-	  to Gigabit Ethernet.
-	  This driver enables Gigabit Ethernet function.

endif # NETDEV_1000

@@ -2659,94 +2535,14 @@ config EHEA
To compile the driver as a module, choose M here. The module will be called ehea.

+source "drivers/net/intel_wired_lan/Kconfig.10000"
+
config ENIC
tristate "Cisco VIC Ethernet NIC Support" depends on PCI && INET
help
This enables the support for the Cisco VIC Ethernet card.

-config IXGBE
- tristate "Intel(R) 10GbE PCI Express adapters support"
- depends on PCI && INET
- select MDIO
- ---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:
-
- <http://support.intel.com>
-
- To compile this driver as a module, choose M here. The module
- will be called ixgbe.
-
-config IXGBE_DCA
- bool "Direct Cache Access (DCA) Support"
- default y
- depends on IXGBE && DCA && !(IXGBE=y && DCA=m)
- ---help---

-	  Say Y here if you want to use Direct Cache Access (DCA) in the
-	  driver.  DCA is a method for warming the CPU cache before data
-	  is used, with the intent of lessening the impact of cache misses.

-
-config IXGBE_DCB
- bool "Data Center Bridging (DCB) Support"
- default n
- depends on IXGBE && DCB
- ---help---
- Say Y here if you want to use Data Center Bridging (DCB) in the
- driver.
-
- If unsure, say N.
-
-config IXGBEVF

-       tristate "Intel(R) 82599 Virtual Function Ethernet support"
-       depends on PCI_MSI
-       ---help---

- This driver supports Intel(R) 82599 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:
-
- <http://support.intel.com>
-
- More specific information on configuring the driver is in
- <file:Documentation/networking/ixgbevf.txt>.
-

-         To compile this driver as a module, choose M here. The module
-         will be called ixgbevf.  MSI-X interrupt support is required
-         for this driver to work correctly.

-
-config IXGB
- tristate "Intel(R) PRO/10GbE support"
- depends on PCI
- ---help---

-	  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:
-
- <http://support.intel.com>
-
- More specific information on configuring the driver is in
- <file:Documentation/networking/ixgb.txt>.
-
- To compile this driver as a module, choose M here. The module
- will be called ixgb.
-
config S2IO
tristate "S2IO 10Gbe XFrame NIC"
depends on PCI

drivers/net/Makefile +8 -8
index b8bf93d..e457b3c 100644
@@ -8,14 +8,14 @@ obj-$(CONFIG_PHYLIB) += phy/
 
 obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
 
-obj-$(CONFIG_E1000) += e1000/
-obj-$(CONFIG_E1000E) += e1000e/
+obj-$(CONFIG_E1000) += intel_wired_lan/e1000/
+obj-$(CONFIG_E1000E) += intel_wired_lan/e1000e/
 obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
-obj-$(CONFIG_IGB) += igb/
-obj-$(CONFIG_IGBVF) += igbvf/
-obj-$(CONFIG_IXGBE) += ixgbe/
-obj-$(CONFIG_IXGBEVF) += ixgbevf/
-obj-$(CONFIG_IXGB) += ixgb/
+obj-$(CONFIG_IGB) += intel_wired_lan/igb/
+obj-$(CONFIG_IGBVF) += intel_wired_lan/igbvf/
+obj-$(CONFIG_IXGBE) += intel_wired_lan/ixgbe/
+obj-$(CONFIG_IXGBEVF) += intel_wired_lan/ixgbevf/
+obj-$(CONFIG_IXGB) += intel_wired_lan/ixgb/
 obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_CHELSIO_T1) += chelsio/
 obj-$(CONFIG_CHELSIO_T3) += cxgb3/
@@ -68,7 +68,7 @@ obj-$(CONFIG_VORTEX) += 3c59x.o
 obj-$(CONFIG_TYPHOON) += typhoon.o
 obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
 obj-$(CONFIG_PCNET32) += pcnet32.o
-obj-$(CONFIG_E100) += e100.o
+obj-$(CONFIG_E100) += intel_wired_lan/e100.o
 obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_EPIC100) += epic100.o
 obj-$(CONFIG_SMSC9420) += smsc9420.o
(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/Kconfig.100
new file mode 100644
index 0000000..6651ae9

drivers/net/intel_wired_lan/Kconfig.100 new file +25 -0
@@ -0,0 +1,25 @@
+config E100
+	tristate "Intel(R) PRO/100+ support"
+	depends on NET_PCI && PCI
+	select MII
+	---help---
+	  This driver supports Intel(R) PRO/100 family of adapters.
+	  To verify that your adapter is supported, find the board ID number
+	  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:
+
+	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+          to identify the adapter.
+
+	  For the latest Intel PRO/100 network driver for Linux, see:
+
+	  <http://appsr.intel.com/scripts-df/support_intel.asp>
+
+	  More specific information on configuring the driver is in
+	  <file:Documentation/networking/intel_wired_lan/e100.txt>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called e100.
(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/Kconfig.1000
new file mode 100644
index 0000000..4a7e13a

drivers/net/intel_wired_lan/Kconfig.1000 new file +42 -0

42 lines not on this page · raw message

support"
+ depends on PCI
+ ---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:
+
+ <http://support.intel.com>
+
+ More specific information on configuring the driver is in
+ <file:Documentation/networking/intel_wired_lan/e1000.txt>.
+
+ To compile this driver as a module, choose M here. The module
+ will be called igb.
+
+config IGB_DCA
+ bool "Direct Cache Access (DCA) Support"
+ default y
+ depends on IGB && DCA && !(IGB=y && DCA=m)
+ ---help---

+	  Say Y here if you want to use Direct Cache Access (DCA) in the
+	  driver.  DCA is a method for warming the CPU cache before data
+	  is used, with the intent of lessening the impact of cache misses.
+
+config IGBVF
+       tristate "Intel(R) 82576 Virtual Function Ethernet support"
+       depends on PCI
+       ---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:
+
+ <http://support.intel.com>
+
+ More specific information on configuring the driver is in
+ <file:Documentation/networking/intel_wired_lan/e1000.txt>.
+
+ To compile this driver as a module, choose M here. The module
+ will be called igbvf.
+
+config PCH_GBE
+ tristate "PCH Gigabit Ethernet"
+ depends on PCI
+ ---help---

+	  This is a gigabit ethernet driver for Topcliff PCH.
+	  Topcliff PCH is the platform controller hub that is used in Intel's
+	  general embedded platform.
+	  Topcliff PCH has Gigabit Ethernet interface.
+	  Using this interface, it is able to access system devices connected
+	  to Gigabit Ethernet.
+	  This driver enables Gigabit Ethernet function.
(quoted diff) +0 -0

b/drivers/net/intel_wired_lan/Kconfig.10000
new file mode 100644
index 0000000..ef35ebd

drivers/net/intel_wired_lan/Kconfig.10000 new file +43 -0

43 lines not on this page · raw message

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:
+
+ <http://support.intel.com>
+
+ More specific information on configuring the driver is in
+ <file:Documentation/networking/intel_wired_lan/ixgbevf.txt>.
+

+         To compile this driver as a module, choose M here. The module
+         will be called ixgbevf.  MSI-X interrupt support is required
+         for this driver to work correctly.

+
+config IXGB
+ tristate "Intel(R) PRO/10GbE support"
+ depends on PCI
+ ---help---

+	  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:
+
+ <http://support.intel.com>
+
+ More specific information on configuring the driver is in
+ <file:Documentation/networking/intel_wired_lan/ixgb.txt>.
+
+ To compile this driver as a module, choose M here. The module
+ will be called ixgb.

From: Joe Perches <[email protected]>
intel: Create directory intel_wired_lan

Perhaps it's better to move drivers from the very populated drivers/net directory into vendor specific directories similar to the Atheros approach used for drivers/net/wireless/ath/

Move intel drivers and Documentation to separate directories Create drivers/net/intel_wired_lan/Kconfig.<speed> and Makefile Modify drivers/net/Kconfig and Makefile
Update MAINTAINERS

---
.../networking/{ => intel_wired_lan}/e100.txt | 0

 .../networking/{ => intel_wired_lan}/e1000.txt     |    0
 .../networking/{ => intel_wired_lan}/e1000e.txt     |    0
 .../networking/{ => intel_wired_lan}/igb.txt       |    0
 .../networking/{ => intel_wired_lan}/igbvf.txt     |    0
 .../networking/{ => intel_wired_lan}/ixgb.txt      |    0
 .../networking/{ => intel_wired_lan}/ixgbe.txt     |    0
 .../networking/{ => intel_wired_lan}/ixgbevf.txt   |    0
 MAINTAINERS                                        |   18 +--
 drivers/net/Kconfig                                |  214 +-------------------
 drivers/net/Makefile                               |   16 +-
 drivers/net/intel_wired_lan/Kconfig.100            |   25 +++
 drivers/net/intel_wired_lan/Kconfig.1000           |  102 ++++++++++
 drivers/net/intel_wired_lan/Kconfig.10000          |   81 ++++++++
 drivers/net/{ => intel_wired_lan}/e100.c           |    0
 drivers/net/{ => intel_wired_lan}/e1000/Makefile   |    0
 drivers/net/{ => intel_wired_lan}/e1000/e1000.h    |    0
 .../{ => intel_wired_lan}/e1000/e1000_ethtool.c    |    0
 drivers/net/{ => intel_wired_lan}/e1000/e1000_hw.c |    0
 drivers/net/{ => intel_wired_lan}/e1000/e1000_hw.h |    0
 .../net/{ => intel_wired_lan}/e1000/e1000_main.c   |    0
 .../net/{ => intel_wired_lan}/e1000/e1000_osdep.h  |    0
 .../net/{ => intel_wired_lan}/e1000/e1000_param.c  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/82571.c   |    0
 drivers/net/{ => intel_wired_lan}/e1000e/Makefile  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/defines.h |    0
 drivers/net/{ => intel_wired_lan}/e1000e/e1000.h   |    0
 drivers/net/{ => intel_wired_lan}/e1000e/es2lan.c  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/ethtool.c |    0
 drivers/net/{ => intel_wired_lan}/e1000e/hw.h      |    0
 drivers/net/{ => intel_wired_lan}/e1000e/ich8lan.c |    0
 drivers/net/{ => intel_wired_lan}/e1000e/lib.c     |    0
 drivers/net/{ => intel_wired_lan}/e1000e/netdev.c  |    0
 drivers/net/{ => intel_wired_lan}/e1000e/param.c   |    0
 drivers/net/{ => intel_wired_lan}/e1000e/phy.c     |    0
 drivers/net/{ => intel_wired_lan}/igb/Makefile     |    0
 .../net/{ => intel_wired_lan}/igb/e1000_82575.c    |    0
 .../net/{ => intel_wired_lan}/igb/e1000_82575.h    |    0
 .../net/{ => intel_wired_lan}/igb/e1000_defines.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_hw.h   |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mac.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mac.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mbx.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_mbx.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_nvm.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_nvm.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_phy.c  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_phy.h  |    0
 drivers/net/{ => intel_wired_lan}/igb/e1000_regs.h |    0
 drivers/net/{ => intel_wired_lan}/igb/igb.h        |    0
 .../net/{ => intel_wired_lan}/igb/igb_ethtool.c    |    0
 drivers/net/{ => intel_wired_lan}/igb/igb_main.c   |    0
 drivers/net/{ => intel_wired_lan}/igbvf/Makefile   |    0
 drivers/net/{ => intel_wired_lan}/igbvf/defines.h  |    0
 drivers/net/{ => intel_wired_lan}/igbvf/ethtool.c  |    0
 drivers/net/{ => intel_wired_lan}/igbvf/igbvf.h    |    0
 drivers/net/{ => intel_wired_lan}/igbvf/mbx.c      |    0
 drivers/net/{ => intel_wired_lan}/igbvf/mbx.h      |    0
 drivers/net/{ => intel_wired_lan}/igbvf/netdev.c   |    0
 drivers/net/{ => intel_wired_lan}/igbvf/regs.h     |    0
 drivers/net/{ => intel_wired_lan}/igbvf/vf.c       |    0
 drivers/net/{ => intel_wired_lan}/igbvf/vf.h       |    0
 drivers/net/{ => intel_wired_lan}/ixgb/Makefile    |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb.h      |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_ee.c   |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_ee.h   |    0
 .../net/{ => intel_wired_lan}/ixgb/ixgb_ethtool.c  |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_hw.c   |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_hw.h   |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_ids.h  |    0
 drivers/net/{ => intel_wired_lan}/ixgb/ixgb_main.c |    0
 .../net/{ => intel_wired_lan}/ixgb/ixgb_osdep.h    |    0
 .../net/{ => intel_wired_lan}/ixgb/ixgb_param.c    |    0
 drivers/net/{ => intel_wired_lan}/ixgbe/Makefile   |    0
 drivers/net/{ => intel_wired_lan}/ixgbe/ixgbe.h    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_82598.c  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_82599.c  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_common.c |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_common.h |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_dcb.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_dcb.h    |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82598.c  |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82598.h  |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82599.c  |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_dcb_82599.h  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_dcb_nl.c |    0
 .../{ => intel_wired_lan}/ixgbe/ixgbe_ethtool.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_fcoe.c   |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_fcoe.h   |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_main.c   |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_mbx.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_mbx.h    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_phy.c    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_phy.h    |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_sriov.c  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_sriov.h  |    0
 .../net/{ => intel_wired_lan}/ixgbe/ixgbe_type.h   |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/Makefile |    0
 .../net/{ => intel_wired_lan}/ixgbevf/defines.h    |    0
 .../net/{ => intel_wired_lan}/ixgbevf/ethtool.c    |    0
 .../net/{ => intel_wired_lan}/ixgbevf/ixgbevf.h    |    0
 .../{ => intel_wired_lan}/ixgbevf/ixgbevf_main.c   |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/mbx.c    |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/mbx.h    |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/regs.h   |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/vf.c     |    0
 drivers/net/{ => intel_wired_lan}/ixgbevf/vf.h     |    0
 107 files changed, 224 insertions(+), 233 deletions(-)
drivers/net/intel_wired_lan/e100.c renamed from drivers/net/e100.c +0 -0
similarity index 100%
rename from drivers/net/e100.c
rename to drivers/net/intel_wired_lan/e100.c
drivers/net/intel_wired_lan/e1000/Makefile renamed from drivers/net/e1000/Makefile +0 -0
similarity index 100%
rename from drivers/net/e1000/Makefile
rename to drivers/net/intel_wired_lan/e1000/Makefile
drivers/net/intel_wired_lan/e1000/e1000.h renamed from drivers/net/e1000/e1000.h +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000.h
rename to drivers/net/intel_wired_lan/e1000/e1000.h
drivers/net/intel_wired_lan/e1000/e1000_ethtool.c renamed from drivers/net/e1000/e1000_ethtool.c +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_ethtool.c
rename to drivers/net/intel_wired_lan/e1000/e1000_ethtool.c
drivers/net/intel_wired_lan/e1000/e1000_hw.c renamed from drivers/net/e1000/e1000_hw.c +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_hw.c
rename to drivers/net/intel_wired_lan/e1000/e1000_hw.c
drivers/net/intel_wired_lan/e1000/e1000_hw.h renamed from drivers/net/e1000/e1000_hw.h +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_hw.h
rename to drivers/net/intel_wired_lan/e1000/e1000_hw.h
drivers/net/intel_wired_lan/e1000/e1000_main.c renamed from drivers/net/e1000/e1000_main.c +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_main.c
rename to drivers/net/intel_wired_lan/e1000/e1000_main.c
drivers/net/intel_wired_lan/e1000/e1000_osdep.h renamed from drivers/net/e1000/e1000_osdep.h +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_osdep.h
rename to drivers/net/intel_wired_lan/e1000/e1000_osdep.h
drivers/net/intel_wired_lan/e1000/e1000_param.c renamed from drivers/net/e1000/e1000_param.c +0 -0
similarity index 100%
rename from drivers/net/e1000/e1000_param.c
rename to drivers/net/intel_wired_lan/e1000/e1000_param.c
drivers/net/intel_wired_lan/e1000e/82571.c renamed from drivers/net/e1000e/82571.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/82571.c
rename to drivers/net/intel_wired_lan/e1000e/82571.c
drivers/net/intel_wired_lan/e1000e/Makefile renamed from drivers/net/e1000e/Makefile +0 -0
similarity index 100%
rename from drivers/net/e1000e/Makefile
rename to drivers/net/intel_wired_lan/e1000e/Makefile
drivers/net/intel_wired_lan/e1000e/defines.h renamed from drivers/net/e1000e/defines.h +0 -0
similarity index 100%
rename from drivers/net/e1000e/defines.h
rename to drivers/net/intel_wired_lan/e1000e/defines.h
drivers/net/intel_wired_lan/e1000e/e1000.h renamed from drivers/net/e1000e/e1000.h +0 -0
similarity index 100%
rename from drivers/net/e1000e/e1000.h
rename to drivers/net/intel_wired_lan/e1000e/e1000.h
drivers/net/intel_wired_lan/e1000e/es2lan.c renamed from drivers/net/e1000e/es2lan.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/es2lan.c
rename to drivers/net/intel_wired_lan/e1000e/es2lan.c
drivers/net/intel_wired_lan/e1000e/ethtool.c renamed from drivers/net/e1000e/ethtool.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/ethtool.c
rename to drivers/net/intel_wired_lan/e1000e/ethtool.c
drivers/net/intel_wired_lan/e1000e/hw.h renamed from drivers/net/e1000e/hw.h +0 -0
similarity index 100%
rename from drivers/net/e1000e/hw.h
rename to drivers/net/intel_wired_lan/e1000e/hw.h
drivers/net/intel_wired_lan/e1000e/ich8lan.c renamed from drivers/net/e1000e/ich8lan.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/ich8lan.c
rename to drivers/net/intel_wired_lan/e1000e/ich8lan.c
drivers/net/intel_wired_lan/e1000e/lib.c renamed from drivers/net/e1000e/lib.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/lib.c
rename to drivers/net/intel_wired_lan/e1000e/lib.c
drivers/net/intel_wired_lan/e1000e/netdev.c renamed from drivers/net/e1000e/netdev.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/netdev.c
rename to drivers/net/intel_wired_lan/e1000e/netdev.c
drivers/net/intel_wired_lan/e1000e/param.c renamed from drivers/net/e1000e/param.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/param.c
rename to drivers/net/intel_wired_lan/e1000e/param.c
drivers/net/intel_wired_lan/e1000e/phy.c renamed from drivers/net/e1000e/phy.c +0 -0
similarity index 100%
rename from drivers/net/e1000e/phy.c
rename to drivers/net/intel_wired_lan/e1000e/phy.c
drivers/net/intel_wired_lan/igb/Makefile renamed from drivers/net/igb/Makefile +0 -0
similarity index 100%
rename from drivers/net/igb/Makefile
rename to drivers/net/intel_wired_lan/igb/Makefile
drivers/net/intel_wired_lan/igb/e1000_82575.c renamed from drivers/net/igb/e1000_82575.c +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_82575.c
rename to drivers/net/intel_wired_lan/igb/e1000_82575.c
drivers/net/intel_wired_lan/igb/e1000_82575.h renamed from drivers/net/igb/e1000_82575.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_82575.h
rename to drivers/net/intel_wired_lan/igb/e1000_82575.h
drivers/net/intel_wired_lan/igb/e1000_defines.h renamed from drivers/net/igb/e1000_defines.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_defines.h
rename to drivers/net/intel_wired_lan/igb/e1000_defines.h
drivers/net/intel_wired_lan/igb/e1000_hw.h renamed from drivers/net/igb/e1000_hw.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_hw.h
rename to drivers/net/intel_wired_lan/igb/e1000_hw.h
drivers/net/intel_wired_lan/igb/e1000_mac.c renamed from drivers/net/igb/e1000_mac.c +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_mac.c
rename to drivers/net/intel_wired_lan/igb/e1000_mac.c
drivers/net/intel_wired_lan/igb/e1000_mac.h renamed from drivers/net/igb/e1000_mac.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_mac.h
rename to drivers/net/intel_wired_lan/igb/e1000_mac.h
drivers/net/intel_wired_lan/igb/e1000_mbx.c renamed from drivers/net/igb/e1000_mbx.c +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_mbx.c
rename to drivers/net/intel_wired_lan/igb/e1000_mbx.c
drivers/net/intel_wired_lan/igb/e1000_mbx.h renamed from drivers/net/igb/e1000_mbx.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_mbx.h
rename to drivers/net/intel_wired_lan/igb/e1000_mbx.h
drivers/net/intel_wired_lan/igb/e1000_nvm.c renamed from drivers/net/igb/e1000_nvm.c +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_nvm.c
rename to drivers/net/intel_wired_lan/igb/e1000_nvm.c
drivers/net/intel_wired_lan/igb/e1000_nvm.h renamed from drivers/net/igb/e1000_nvm.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_nvm.h
rename to drivers/net/intel_wired_lan/igb/e1000_nvm.h
drivers/net/intel_wired_lan/igb/e1000_phy.c renamed from drivers/net/igb/e1000_phy.c +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_phy.c
rename to drivers/net/intel_wired_lan/igb/e1000_phy.c
drivers/net/intel_wired_lan/igb/e1000_phy.h renamed from drivers/net/igb/e1000_phy.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_phy.h
rename to drivers/net/intel_wired_lan/igb/e1000_phy.h
drivers/net/intel_wired_lan/igb/e1000_regs.h renamed from drivers/net/igb/e1000_regs.h +0 -0
similarity index 100%
rename from drivers/net/igb/e1000_regs.h
rename to drivers/net/intel_wired_lan/igb/e1000_regs.h
drivers/net/intel_wired_lan/igb/igb.h renamed from drivers/net/igb/igb.h +0 -0
similarity index 100%
rename from drivers/net/igb/igb.h
rename to drivers/net/intel_wired_lan/igb/igb.h
drivers/net/intel_wired_lan/igb/igb_ethtool.c renamed from drivers/net/igb/igb_ethtool.c +0 -0
similarity index 100%
rename from drivers/net/igb/igb_ethtool.c
rename to drivers/net/intel_wired_lan/igb/igb_ethtool.c
drivers/net/intel_wired_lan/igb/igb_main.c renamed from drivers/net/igb/igb_main.c +0 -0
similarity index 100%
rename from drivers/net/igb/igb_main.c
rename to drivers/net/intel_wired_lan/igb/igb_main.c
drivers/net/intel_wired_lan/igbvf/Makefile renamed from drivers/net/igbvf/Makefile +0 -0
similarity index 100%
rename from drivers/net/igbvf/Makefile
rename to drivers/net/intel_wired_lan/igbvf/Makefile
drivers/net/intel_wired_lan/igbvf/defines.h renamed from drivers/net/igbvf/defines.h +0 -0
similarity index 100%
rename from drivers/net/igbvf/defines.h
rename to drivers/net/intel_wired_lan/igbvf/defines.h
drivers/net/intel_wired_lan/igbvf/ethtool.c renamed from drivers/net/igbvf/ethtool.c +0 -0
similarity index 100%
rename from drivers/net/igbvf/ethtool.c
rename to drivers/net/intel_wired_lan/igbvf/ethtool.c
drivers/net/intel_wired_lan/igbvf/igbvf.h renamed from drivers/net/igbvf/igbvf.h +0 -0
similarity index 100%
rename from drivers/net/igbvf/igbvf.h
rename to drivers/net/intel_wired_lan/igbvf/igbvf.h
drivers/net/intel_wired_lan/igbvf/mbx.c renamed from drivers/net/igbvf/mbx.c +0 -0
similarity index 100%
rename from drivers/net/igbvf/mbx.c
rename to drivers/net/intel_wired_lan/igbvf/mbx.c
drivers/net/intel_wired_lan/igbvf/mbx.h renamed from drivers/net/igbvf/mbx.h +0 -0
similarity index 100%
rename from drivers/net/igbvf/mbx.h
rename to drivers/net/intel_wired_lan/igbvf/mbx.h
drivers/net/intel_wired_lan/igbvf/netdev.c renamed from drivers/net/igbvf/netdev.c +0 -0
similarity index 100%
rename from drivers/net/igbvf/netdev.c
rename to drivers/net/intel_wired_lan/igbvf/netdev.c
drivers/net/intel_wired_lan/igbvf/regs.h renamed from drivers/net/igbvf/regs.h +0 -0
similarity index 100%
rename from drivers/net/igbvf/regs.h
rename to drivers/net/intel_wired_lan/igbvf/regs.h
drivers/net/intel_wired_lan/igbvf/vf.c renamed from drivers/net/igbvf/vf.c +0 -0
similarity index 100%
rename from drivers/net/igbvf/vf.c
rename to drivers/net/intel_wired_lan/igbvf/vf.c
drivers/net/intel_wired_lan/igbvf/vf.h renamed from drivers/net/igbvf/vf.h +0 -0
similarity index 100%
rename from drivers/net/igbvf/vf.h
rename to drivers/net/intel_wired_lan/igbvf/vf.h
drivers/net/intel_wired_lan/ixgb/Makefile renamed from drivers/net/ixgb/Makefile +0 -0
similarity index 100%
rename from drivers/net/ixgb/Makefile
rename to drivers/net/intel_wired_lan/ixgb/Makefile
drivers/net/intel_wired_lan/ixgb/ixgb.h renamed from drivers/net/ixgb/ixgb.h +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb.h
drivers/net/intel_wired_lan/ixgb/ixgb_ee.c renamed from drivers/net/ixgb/ixgb_ee.c +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_ee.c
rename to drivers/net/intel_wired_lan/ixgb/ixgb_ee.c
drivers/net/intel_wired_lan/ixgb/ixgb_ee.h renamed from drivers/net/ixgb/ixgb_ee.h +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_ee.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb_ee.h
drivers/net/intel_wired_lan/ixgb/ixgb_ethtool.c renamed from drivers/net/ixgb/ixgb_ethtool.c +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_ethtool.c
rename to drivers/net/intel_wired_lan/ixgb/ixgb_ethtool.c
drivers/net/intel_wired_lan/ixgb/ixgb_hw.c renamed from drivers/net/ixgb/ixgb_hw.c +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_hw.c
rename to drivers/net/intel_wired_lan/ixgb/ixgb_hw.c
drivers/net/intel_wired_lan/ixgb/ixgb_hw.h renamed from drivers/net/ixgb/ixgb_hw.h +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_hw.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb_hw.h
drivers/net/intel_wired_lan/ixgb/ixgb_ids.h renamed from drivers/net/ixgb/ixgb_ids.h +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_ids.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb_ids.h
drivers/net/intel_wired_lan/ixgb/ixgb_main.c renamed from drivers/net/ixgb/ixgb_main.c +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_main.c
rename to drivers/net/intel_wired_lan/ixgb/ixgb_main.c
drivers/net/intel_wired_lan/ixgb/ixgb_osdep.h renamed from drivers/net/ixgb/ixgb_osdep.h +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_osdep.h
rename to drivers/net/intel_wired_lan/ixgb/ixgb_osdep.h
drivers/net/intel_wired_lan/ixgb/ixgb_param.c renamed from drivers/net/ixgb/ixgb_param.c +0 -0
similarity index 100%
rename from drivers/net/ixgb/ixgb_param.c
rename to drivers/net/intel_wired_lan/ixgb/ixgb_param.c
drivers/net/intel_wired_lan/ixgbe/Makefile renamed from drivers/net/ixgbe/Makefile +0 -0
similarity index 100%
rename from drivers/net/ixgbe/Makefile
rename to drivers/net/intel_wired_lan/ixgbe/Makefile
drivers/net/intel_wired_lan/ixgbe/ixgbe.h renamed from drivers/net/ixgbe/ixgbe.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_82598.c renamed from drivers/net/ixgbe/ixgbe_82598.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_82598.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_82598.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_82599.c renamed from drivers/net/ixgbe/ixgbe_82599.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_82599.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_82599.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_common.c renamed from drivers/net/ixgbe/ixgbe_common.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_common.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_common.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_common.h renamed from drivers/net/ixgbe/ixgbe_common.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_common.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_common.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.c renamed from drivers/net/ixgbe/ixgbe_dcb.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.h renamed from drivers/net/ixgbe/ixgbe_dcb.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.c renamed from drivers/net/ixgbe/ixgbe_dcb_82598.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82598.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.h renamed from drivers/net/ixgbe/ixgbe_dcb_82598.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82598.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82598.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.c renamed from drivers/net/ixgbe/ixgbe_dcb_82599.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82599.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.h renamed from drivers/net/ixgbe/ixgbe_dcb_82599.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_82599.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_82599.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_nl.c renamed from drivers/net/ixgbe/ixgbe_dcb_nl.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_dcb_nl.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_dcb_nl.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_ethtool.c renamed from drivers/net/ixgbe/ixgbe_ethtool.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_ethtool.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_ethtool.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.c renamed from drivers/net/ixgbe/ixgbe_fcoe.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_fcoe.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.h renamed from drivers/net/ixgbe/ixgbe_fcoe.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_fcoe.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_fcoe.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_main.c renamed from drivers/net/ixgbe/ixgbe_main.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_main.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_main.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.c renamed from drivers/net/ixgbe/ixgbe_mbx.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_mbx.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.h renamed from drivers/net/ixgbe/ixgbe_mbx.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_mbx.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_mbx.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.c renamed from drivers/net/ixgbe/ixgbe_phy.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_phy.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.h renamed from drivers/net/ixgbe/ixgbe_phy.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_phy.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_phy.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.c renamed from drivers/net/ixgbe/ixgbe_sriov.c +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_sriov.c
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.c
drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.h renamed from drivers/net/ixgbe/ixgbe_sriov.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_sriov.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_sriov.h
drivers/net/intel_wired_lan/ixgbe/ixgbe_type.h renamed from drivers/net/ixgbe/ixgbe_type.h +0 -0
similarity index 100%
rename from drivers/net/ixgbe/ixgbe_type.h
rename to drivers/net/intel_wired_lan/ixgbe/ixgbe_type.h
drivers/net/intel_wired_lan/ixgbevf/Makefile renamed from drivers/net/ixgbevf/Makefile +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/Makefile
rename to drivers/net/intel_wired_lan/ixgbevf/Makefile
drivers/net/intel_wired_lan/ixgbevf/defines.h renamed from drivers/net/ixgbevf/defines.h +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/defines.h
rename to drivers/net/intel_wired_lan/ixgbevf/defines.h
drivers/net/intel_wired_lan/ixgbevf/ethtool.c renamed from drivers/net/ixgbevf/ethtool.c +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/ethtool.c
rename to drivers/net/intel_wired_lan/ixgbevf/ethtool.c
drivers/net/intel_wired_lan/ixgbevf/ixgbevf.h renamed from drivers/net/ixgbevf/ixgbevf.h +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/ixgbevf.h
rename to drivers/net/intel_wired_lan/ixgbevf/ixgbevf.h
drivers/net/intel_wired_lan/ixgbevf/ixgbevf_main.c renamed from drivers/net/ixgbevf/ixgbevf_main.c +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/ixgbevf_main.c
rename to drivers/net/intel_wired_lan/ixgbevf/ixgbevf_main.c
drivers/net/intel_wired_lan/ixgbevf/mbx.c renamed from drivers/net/ixgbevf/mbx.c +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/mbx.c
rename to drivers/net/intel_wired_lan/ixgbevf/mbx.c
drivers/net/intel_wired_lan/ixgbevf/mbx.h renamed from drivers/net/ixgbevf/mbx.h +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/mbx.h
rename to drivers/net/intel_wired_lan/ixgbevf/mbx.h
drivers/net/intel_wired_lan/ixgbevf/regs.h renamed from drivers/net/ixgbevf/regs.h +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/regs.h
rename to drivers/net/intel_wired_lan/ixgbevf/regs.h
drivers/net/intel_wired_lan/ixgbevf/vf.c renamed from drivers/net/ixgbevf/vf.c +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/vf.c
rename to drivers/net/intel_wired_lan/ixgbevf/vf.c
drivers/net/intel_wired_lan/ixgbevf/vf.h renamed from drivers/net/ixgbevf/vf.h +0 -0
similarity index 100%
rename from drivers/net/ixgbevf/vf.h
rename to drivers/net/intel_wired_lan/ixgbevf/vf.h

--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Documentation/networking/intel_wired_lan/e100.txt renamed from Documentation/networking/e100.txt +0 -0
similarity index 100%
rename from Documentation/networking/e100.txt
rename to Documentation/networking/intel_wired_lan/e100.txt
Documentation/networking/intel_wired_lan/e1000.txt renamed from Documentation/networking/e1000.txt +0 -0
similarity index 100%
rename from Documentation/networking/e1000.txt
rename to Documentation/networking/intel_wired_lan/e1000.txt
Documentation/networking/intel_wired_lan/e1000e.txt renamed from Documentation/networking/e1000e.txt +0 -0
similarity index 100%
rename from Documentation/networking/e1000e.txt
rename to Documentation/networking/intel_wired_lan/e1000e.txt
Documentation/networking/intel_wired_lan/igb.txt renamed from Documentation/networking/igb.txt +0 -0
similarity index 100%
rename from Documentation/networking/igb.txt
rename to Documentation/networking/intel_wired_lan/igb.txt
Documentation/networking/intel_wired_lan/igbvf.txt renamed from Documentation/networking/igbvf.txt +0 -0
similarity index 100%
rename from Documentation/networking/igbvf.txt
rename to Documentation/networking/intel_wired_lan/igbvf.txt
Documentation/networking/intel_wired_lan/ixgb.txt renamed from Documentation/networking/ixgb.txt +0 -0
similarity index 100%
rename from Documentation/networking/ixgb.txt
rename to Documentation/networking/intel_wired_lan/ixgb.txt
Documentation/networking/intel_wired_lan/ixgbe.txt renamed from Documentation/networking/ixgbe.txt +0 -0
similarity index 100%
rename from Documentation/networking/ixgbe.txt
rename to Documentation/networking/intel_wired_lan/ixgbe.txt
Documentation/networking/intel_wired_lan/ixgbevf.txt renamed from Documentation/networking/ixgbevf.txt +0 -0
similarity index 100%
rename from Documentation/networking/ixgbevf.txt
rename to Documentation/networking/intel_wired_lan/ixgbevf.txt
MAINTAINERS +2 -16
index ba8603c..b086404 100644
@@ -3096,22 +3096,8 @@ M:	John Ronciak <[email protected]>
 L:	[email protected]
 W:	http://e1000.sourceforge.net/
 S:	Supported
-F:	Documentation/networking/e100.txt
-F:	Documentation/networking/e1000.txt
-F:	Documentation/networking/e1000e.txt
-F:	Documentation/networking/igb.txt
-F:	Documentation/networking/igbvf.txt
-F:	Documentation/networking/ixgb.txt
-F:	Documentation/networking/ixgbe.txt
-F:	Documentation/networking/ixgbevf.txt
-F:	drivers/net/e100.c
-F:	drivers/net/e1000/
-F:	drivers/net/e1000e/
-F:	drivers/net/igb/
-F:	drivers/net/igbvf/
-F:	drivers/net/ixgb/
-F:	drivers/net/ixgbe/
-F:	drivers/net/ixgbevf/
+F:	Documentation/networking/intel_wired_lan/
+F:	drivers/net/intel_wired_lan/
 
 INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
 L:	[email protected]
drivers/net/Kconfig +5 -209

256 lines not on this page · raw message

drivers/net/Makefile +8 -8
index b8bf93d..e457b3c 100644
@@ -8,14 +8,14 @@ obj-$(CONFIG_PHYLIB) += phy/
 
 obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
 
-obj-$(CONFIG_E1000) += e1000/
-obj-$(CONFIG_E1000E) += e1000e/
+obj-$(CONFIG_E1000) += intel_wired_lan/e1000/
+obj-$(CONFIG_E1000E) += intel_wired_lan/e1000e/
 obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
-obj-$(CONFIG_IGB) += igb/
-obj-$(CONFIG_IGBVF) += igbvf/
-obj-$(CONFIG_IXGBE) += ixgbe/
-obj-$(CONFIG_IXGBEVF) += ixgbevf/
-obj-$(CONFIG_IXGB) += ixgb/
+obj-$(CONFIG_IGB) += intel_wired_lan/igb/
+obj-$(CONFIG_IGBVF) += intel_wired_lan/igbvf/
+obj-$(CONFIG_IXGBE) += intel_wired_lan/ixgbe/
+obj-$(CONFIG_IXGBEVF) += intel_wired_lan/ixgbevf/
+obj-$(CONFIG_IXGB) += intel_wired_lan/ixgb/
 obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_CHELSIO_T1) += chelsio/
 obj-$(CONFIG_CHELSIO_T3) += cxgb3/
@@ -68,7 +68,7 @@ obj-$(CONFIG_VORTEX) += 3c59x.o
 obj-$(CONFIG_TYPHOON) += typhoon.o
 obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
 obj-$(CONFIG_PCNET32) += pcnet32.o
-obj-$(CONFIG_E100) += e100.o
+obj-$(CONFIG_E100) += intel_wired_lan/e100.o
 obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_EPIC100) += epic100.o
 obj-$(CONFIG_SMSC9420) += smsc9420.o
drivers/net/intel_wired_lan/Kconfig.100 new file +25 -0
new file mode 100644
index 0000000..6651ae9
@@ -0,0 +1,25 @@
+config E100
+	tristate "Intel(R) PRO/100+ support"
+	depends on NET_PCI && PCI
+	select MII
+	---help---
+	  This driver supports Intel(R) PRO/100 family of adapters.
+	  To verify that your adapter is supported, find the board ID number
+	  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:
+
+	  <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+          to identify the adapter.
+
+	  For the latest Intel PRO/100 network driver for Linux, see:
+
+	  <http://appsr.intel.com/scripts-df/support_intel.asp>
+
+	  More specific information on configuring the driver is in
+	  <file:Documentation/networking/intel_wired_lan/e100.txt>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called e100.
drivers/net/intel_wired_lan/Kconfig.1000 new file +102 -0

102 lines not on this page · raw message

drivers/net/intel_wired_lan/Kconfig.10000 new file +81 -0

81 lines not on this page · raw message

#9 lore raw
Quoted 7 lines · Jeff Kirsher
Quoted 6 lines · Joe Perches
Quoted 5 lines · Jeff Kirsher

On Wed, 2010-10-13 at 15:28 -0700, Joe Perches wrote:
Sorry I am not ignoring you, I was taking a closer look at your patch.

Quoted 1 line

What regression testing would actually be done?

The Makefile and Kconfig needs more work. I applied your patch and none of the Intel Wired drivers build.

Quoted 8 lines
Quoted 2 lines

Care to describe the Makefile/Kconfig issues you have seen? I built it allyesconfig, defconfig, allmodconfig and allnoconfig.

Yeah, I found all of those built without errors, but if you build the Intel Wired LAN drivers as modules, you will not find the *.ko files after the build. The Kconfig files look fine, the problem was with the Makefiles. Instead of creating a drivers/net/intel_wired_lan/Makefile, I simply changed the path in drivers/net/Makefile to the updated path and that resolved the issue.

(adding a few cc's and a link for history)

http://lkml.org/lkml/2010/10/10/207

That's the way I had done it originally as well, but I found you couldn't build the directory with:

make drivers/net/intel_wired_lan/

so I created a Makefile in the new directory below with the elements necessary.

Perhaps there's some missing functionality in the build system when the Kconfig file resides in a higher directory and the directory being built doesn't have a Kconfig file?

I think it'd wrong to duplicate the makefile components in 2 places to allow "make subdir/" and I wonder if there's a good solution for this.

Quoted 2 lines

As far as the sub-directory name "intel_wired_lan", what about "intel" or "intel_wired"? Just a thought...

Using "intel" seemed too sweeping because of the wireless drivers. I think intel_wired_lan isn't overly long, but your choice...

Should the new (OKI?/intel) pch_gbe directory be moved as well? It's using a PCI_VENDOR_ID_INTEL.

#10 lore raw
Quoted 24 lines · Joe Perches
Quoted 7 lines · Jeff Kirsher
Quoted 6 lines · Joe Perches
Quoted 5 lines · Jeff Kirsher

On Wed, 2010-10-13 at 15:28 -0700, Joe Perches wrote:
Sorry I am not ignoring you, I was taking a closer look at your patch.

Quoted 1 line

What regression testing would actually be done?

The Makefile and Kconfig needs more work. I applied your patch and none of the Intel Wired drivers build.

Quoted 8 lines
Quoted 2 lines

Care to describe the Makefile/Kconfig issues you have seen? I built it allyesconfig, defconfig, allmodconfig and allnoconfig.

Yeah, I found all of those built without errors, but if you build the Intel Wired LAN drivers as modules, you will not find the *.ko files after the build. The Kconfig files look fine, the problem was with the Makefiles. Instead of creating a drivers/net/intel_wired_lan/Makefile, I simply changed the path in drivers/net/Makefile to the updated path and that resolved the issue.

(adding a few cc's and a link for history)

http://lkml.org/lkml/2010/10/10/207

That's the way I had done it originally as well, but I found you couldn't build the directory with:

Quoted 8 lines

make drivers/net/intel_wired_lan/

so I created a Makefile in the new directory below with the elements necessary.

Perhaps there's some missing functionality in the build system when the Kconfig file resides in a higher directory and the directory being built doesn't have a Kconfig file?

This has nothing to do with Kconfig files, I assume you meant Makefiles.

Quoted 3 lines

I think it'd wrong to duplicate the makefile components in 2 places to allow "make subdir/" and I wonder if there's a good solution for this.

There is no duplication needed, drivers/net/Makefile needs to contain obj-y += intel_wired_lan/ and drivers/net/intel_wired_lan/Makefile similar lines for its subdirs. I see your original patch was lacking an entry in drivers/net/Makefile, so perhaps that was the problem Jeff was seeing?

Michal

------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired

#11 lore raw
In reply to Joe Perches
Quoted 37 lines · Joe Perches
Quoted 7 lines · Jeff Kirsher
Quoted 6 lines · Joe Perches
Quoted 5 lines · Jeff Kirsher

On Wed, 2010-10-13 at 15:28 -0700, Joe Perches wrote:
Sorry I am not ignoring you, I was taking a closer look at your patch.

Quoted 1 line

What regression testing would actually be done?

The Makefile and Kconfig needs more work. I applied your patch and none of the Intel Wired drivers build.

Quoted 8 lines
Quoted 2 lines

Care to describe the Makefile/Kconfig issues you have seen? I built it allyesconfig, defconfig, allmodconfig and allnoconfig.

Yeah, I found all of those built without errors, but if you build the Intel Wired LAN drivers as modules, you will not find the *.ko files after the build. The Kconfig files look fine, the problem was with the Makefiles. Instead of creating a drivers/net/intel_wired_lan/Makefile, I simply changed the path in drivers/net/Makefile to the updated path and that resolved the issue.

(adding a few cc's and a link for history)

http://lkml.org/lkml/2010/10/10/207

That's the way I had done it originally as well, but I found you couldn't build the directory with:

make drivers/net/intel_wired_lan/

so I created a Makefile in the new directory below with the elements necessary.

Perhaps there's some missing functionality in the build system when the Kconfig file resides in a higher directory and the directory being built doesn't have a Kconfig file?

I think it'd wrong to duplicate the makefile components in 2 places to allow "make subdir/" and I wonder if there's a good solution for this.

Quoted 10 lines
Quoted 2 lines

As far as the sub-directory name "intel_wired_lan", what about "intel" or "intel_wired"? Just a thought...

Using "intel" seemed too sweeping because of the wireless drivers. I think intel_wired_lan isn't overly long, but your choice...

Should the new (OKI?/intel) pch_gbe directory be moved as well? It's using a PCI_VENDOR_ID_INTEL.

No, the pch_gbe is not our driver.