]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
intel: Move the Intel wired LAN drivers
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 7 Apr 2011 14:42:33 +0000 (07:42 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 11 Aug 2011 03:03:27 +0000 (20:03 -0700)
Moves the Intel wired LAN drivers into drivers/net/ethernet/intel/ and
the necessary Kconfig and Makefile changes.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
101 files changed:
MAINTAINERS
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/ethernet/Kconfig
drivers/net/ethernet/Makefile
drivers/net/ethernet/intel/Kconfig [new file with mode: 0644]
drivers/net/ethernet/intel/Makefile [new file with mode: 0644]
drivers/net/ethernet/intel/e100.c [moved from drivers/net/e100.c with 100% similarity]
drivers/net/ethernet/intel/e1000/Makefile [moved from drivers/net/e1000/Makefile with 100% similarity]
drivers/net/ethernet/intel/e1000/e1000.h [moved from drivers/net/e1000/e1000.h with 100% similarity]
drivers/net/ethernet/intel/e1000/e1000_ethtool.c [moved from drivers/net/e1000/e1000_ethtool.c with 100% similarity]
drivers/net/ethernet/intel/e1000/e1000_hw.c [moved from drivers/net/e1000/e1000_hw.c with 100% similarity]
drivers/net/ethernet/intel/e1000/e1000_hw.h [moved from drivers/net/e1000/e1000_hw.h with 100% similarity]
drivers/net/ethernet/intel/e1000/e1000_main.c [moved from drivers/net/e1000/e1000_main.c with 100% similarity]
drivers/net/ethernet/intel/e1000/e1000_osdep.h [moved from drivers/net/e1000/e1000_osdep.h with 100% similarity]
drivers/net/ethernet/intel/e1000/e1000_param.c [moved from drivers/net/e1000/e1000_param.c with 100% similarity]
drivers/net/ethernet/intel/e1000e/80003es2lan.c [moved from drivers/net/e1000e/es2lan.c with 100% similarity]
drivers/net/ethernet/intel/e1000e/82571.c [moved from drivers/net/e1000e/82571.c with 100% similarity]
drivers/net/ethernet/intel/e1000e/Makefile [moved from drivers/net/e1000e/Makefile with 96% similarity]
drivers/net/ethernet/intel/e1000e/defines.h [moved from drivers/net/e1000e/defines.h with 100% similarity]
drivers/net/ethernet/intel/e1000e/e1000.h [moved from drivers/net/e1000e/e1000.h with 100% similarity]
drivers/net/ethernet/intel/e1000e/ethtool.c [moved from drivers/net/e1000e/ethtool.c with 100% similarity]
drivers/net/ethernet/intel/e1000e/hw.h [moved from drivers/net/e1000e/hw.h with 100% similarity]
drivers/net/ethernet/intel/e1000e/ich8lan.c [moved from drivers/net/e1000e/ich8lan.c with 100% similarity]
drivers/net/ethernet/intel/e1000e/lib.c [moved from drivers/net/e1000e/lib.c with 100% similarity]
drivers/net/ethernet/intel/e1000e/netdev.c [moved from drivers/net/e1000e/netdev.c with 100% similarity]
drivers/net/ethernet/intel/e1000e/param.c [moved from drivers/net/e1000e/param.c with 100% similarity]
drivers/net/ethernet/intel/e1000e/phy.c [moved from drivers/net/e1000e/phy.c with 100% similarity]
drivers/net/ethernet/intel/igb/Makefile [moved from drivers/net/igb/Makefile with 100% similarity]
drivers/net/ethernet/intel/igb/e1000_82575.c [moved from drivers/net/igb/e1000_82575.c with 100% similarity]
drivers/net/ethernet/intel/igb/e1000_82575.h [moved from drivers/net/igb/e1000_82575.h with 100% similarity]
drivers/net/ethernet/intel/igb/e1000_defines.h [moved from drivers/net/igb/e1000_defines.h with 100% similarity]
drivers/net/ethernet/intel/igb/e1000_hw.h [moved from drivers/net/igb/e1000_hw.h with 100% similarity]
drivers/net/ethernet/intel/igb/e1000_mac.c [moved from drivers/net/igb/e1000_mac.c with 100% similarity]
drivers/net/ethernet/intel/igb/e1000_mac.h [moved from drivers/net/igb/e1000_mac.h with 100% similarity]
drivers/net/ethernet/intel/igb/e1000_mbx.c [moved from drivers/net/igb/e1000_mbx.c with 100% similarity]
drivers/net/ethernet/intel/igb/e1000_mbx.h [moved from drivers/net/igb/e1000_mbx.h with 100% similarity]
drivers/net/ethernet/intel/igb/e1000_nvm.c [moved from drivers/net/igb/e1000_nvm.c with 100% similarity]
drivers/net/ethernet/intel/igb/e1000_nvm.h [moved from drivers/net/igb/e1000_nvm.h with 100% similarity]
drivers/net/ethernet/intel/igb/e1000_phy.c [moved from drivers/net/igb/e1000_phy.c with 100% similarity]
drivers/net/ethernet/intel/igb/e1000_phy.h [moved from drivers/net/igb/e1000_phy.h with 100% similarity]
drivers/net/ethernet/intel/igb/e1000_regs.h [moved from drivers/net/igb/e1000_regs.h with 100% similarity]
drivers/net/ethernet/intel/igb/igb.h [moved from drivers/net/igb/igb.h with 100% similarity]
drivers/net/ethernet/intel/igb/igb_ethtool.c [moved from drivers/net/igb/igb_ethtool.c with 100% similarity]
drivers/net/ethernet/intel/igb/igb_main.c [moved from drivers/net/igb/igb_main.c with 100% similarity]
drivers/net/ethernet/intel/igbvf/Makefile [moved from drivers/net/igbvf/Makefile with 100% similarity]
drivers/net/ethernet/intel/igbvf/defines.h [moved from drivers/net/igbvf/defines.h with 100% similarity]
drivers/net/ethernet/intel/igbvf/ethtool.c [moved from drivers/net/igbvf/ethtool.c with 100% similarity]
drivers/net/ethernet/intel/igbvf/igbvf.h [moved from drivers/net/igbvf/igbvf.h with 100% similarity]
drivers/net/ethernet/intel/igbvf/mbx.c [moved from drivers/net/igbvf/mbx.c with 100% similarity]
drivers/net/ethernet/intel/igbvf/mbx.h [moved from drivers/net/igbvf/mbx.h with 100% similarity]
drivers/net/ethernet/intel/igbvf/netdev.c [moved from drivers/net/igbvf/netdev.c with 100% similarity]
drivers/net/ethernet/intel/igbvf/regs.h [moved from drivers/net/igbvf/regs.h with 100% similarity]
drivers/net/ethernet/intel/igbvf/vf.c [moved from drivers/net/igbvf/vf.c with 100% similarity]
drivers/net/ethernet/intel/igbvf/vf.h [moved from drivers/net/igbvf/vf.h with 100% similarity]
drivers/net/ethernet/intel/ixgb/Makefile [moved from drivers/net/ixgb/Makefile with 100% similarity]
drivers/net/ethernet/intel/ixgb/ixgb.h [moved from drivers/net/ixgb/ixgb.h with 100% similarity]
drivers/net/ethernet/intel/ixgb/ixgb_ee.c [moved from drivers/net/ixgb/ixgb_ee.c with 100% similarity]
drivers/net/ethernet/intel/ixgb/ixgb_ee.h [moved from drivers/net/ixgb/ixgb_ee.h with 100% similarity]
drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c [moved from drivers/net/ixgb/ixgb_ethtool.c with 100% similarity]
drivers/net/ethernet/intel/ixgb/ixgb_hw.c [moved from drivers/net/ixgb/ixgb_hw.c with 100% similarity]
drivers/net/ethernet/intel/ixgb/ixgb_hw.h [moved from drivers/net/ixgb/ixgb_hw.h with 100% similarity]
drivers/net/ethernet/intel/ixgb/ixgb_ids.h [moved from drivers/net/ixgb/ixgb_ids.h with 100% similarity]
drivers/net/ethernet/intel/ixgb/ixgb_main.c [moved from drivers/net/ixgb/ixgb_main.c with 100% similarity]
drivers/net/ethernet/intel/ixgb/ixgb_osdep.h [moved from drivers/net/ixgb/ixgb_osdep.h with 100% similarity]
drivers/net/ethernet/intel/ixgb/ixgb_param.c [moved from drivers/net/ixgb/ixgb_param.c with 100% similarity]
drivers/net/ethernet/intel/ixgbe/Makefile [moved from drivers/net/ixgbe/Makefile with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe.h [moved from drivers/net/ixgbe/ixgbe.h with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c [moved from drivers/net/ixgbe/ixgbe_82598.c with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c [moved from drivers/net/ixgbe/ixgbe_82599.c with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c [moved from drivers/net/ixgbe/ixgbe_common.c with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_common.h [moved from drivers/net/ixgbe/ixgbe_common.h with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c [moved from drivers/net/ixgbe/ixgbe_dcb.c with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h [moved from drivers/net/ixgbe/ixgbe_dcb.h with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c [moved from drivers/net/ixgbe/ixgbe_dcb_82598.c with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h [moved from drivers/net/ixgbe/ixgbe_dcb_82598.h with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c [moved from drivers/net/ixgbe/ixgbe_dcb_82599.c with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h [moved from drivers/net/ixgbe/ixgbe_dcb_82599.h with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c [moved from drivers/net/ixgbe/ixgbe_dcb_nl.c with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c [moved from drivers/net/ixgbe/ixgbe_ethtool.c with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c [moved from drivers/net/ixgbe/ixgbe_fcoe.c with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h [moved from drivers/net/ixgbe/ixgbe_fcoe.h with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c [moved from drivers/net/ixgbe/ixgbe_main.c with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c [moved from drivers/net/ixgbe/ixgbe_mbx.c with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h [moved from drivers/net/ixgbe/ixgbe_mbx.h with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c [moved from drivers/net/ixgbe/ixgbe_phy.c with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h [moved from drivers/net/ixgbe/ixgbe_phy.h with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c [moved from drivers/net/ixgbe/ixgbe_sriov.c with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h [moved from drivers/net/ixgbe/ixgbe_sriov.h with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h [moved from drivers/net/ixgbe/ixgbe_type.h with 100% similarity]
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c [moved from drivers/net/ixgbe/ixgbe_x540.c with 100% similarity]
drivers/net/ethernet/intel/ixgbevf/Makefile [moved from drivers/net/ixgbevf/Makefile with 100% similarity]
drivers/net/ethernet/intel/ixgbevf/defines.h [moved from drivers/net/ixgbevf/defines.h with 100% similarity]
drivers/net/ethernet/intel/ixgbevf/ethtool.c [moved from drivers/net/ixgbevf/ethtool.c with 100% similarity]
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h [moved from drivers/net/ixgbevf/ixgbevf.h with 100% similarity]
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c [moved from drivers/net/ixgbevf/ixgbevf_main.c with 100% similarity]
drivers/net/ethernet/intel/ixgbevf/mbx.c [moved from drivers/net/ixgbevf/mbx.c with 100% similarity]
drivers/net/ethernet/intel/ixgbevf/mbx.h [moved from drivers/net/ixgbevf/mbx.h with 100% similarity]
drivers/net/ethernet/intel/ixgbevf/regs.h [moved from drivers/net/ixgbevf/regs.h with 100% similarity]
drivers/net/ethernet/intel/ixgbevf/vf.c [moved from drivers/net/ixgbevf/vf.c with 100% similarity]
drivers/net/ethernet/intel/ixgbevf/vf.h [moved from drivers/net/ixgbevf/vf.h with 100% similarity]

index 0853d00c7d48c68487f54da9144ad9613f6a058c..f4838da520c35ca32d6b24b4d63d52beb2ce424c 100644 (file)
@@ -3340,13 +3340,13 @@ M:      Bruce Allan <bruce.w.allan@intel.com>
 M:     Carolyn Wyborny <carolyn.wyborny@intel.com>
 M:     Don Skidmore <donald.c.skidmore@intel.com>
 M:     Greg Rose <gregory.v.rose@intel.com>
-M:     PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
+M:     Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
 M:     Alex Duyck <alexander.h.duyck@intel.com>
 M:     John Ronciak <john.ronciak@intel.com>
 L:     e1000-devel@lists.sourceforge.net
 W:     http://e1000.sourceforge.net/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-2.6.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
 S:     Supported
 F:     Documentation/networking/e100.txt
 F:     Documentation/networking/e1000.txt
@@ -3356,14 +3356,7 @@ 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:     drivers/net/ethernet/intel/
 
 INTEL MRST PMU DRIVER
 M:     Len Brown <len.brown@intel.com>
index 77ab2e189475374d4f761fbf8505a1a34724d613..e6491169cc6fee8df1d7fe020834620ef56c8b91 100644 (file)
@@ -1032,32 +1032,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://www.intel.com/p/en_US/support/highlights/network/pro100plus>
-
-         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 FEALNX
        tristate "Myson MTD-8xx PCI Ethernet support"
        depends on NET_PCI && PCI
@@ -1490,47 +1464,6 @@ 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)
-       select CRC32
-       ---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 IP1000
        tristate "IP1000 Gigabit Ethernet support"
        depends on PCI && EXPERIMENTAL
@@ -1541,57 +1474,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 NS83820
@@ -1958,88 +1840,6 @@ config ENIC
        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 "Exar Xframe 10Gb Ethernet Adapter"
        depends on PCI
index a987d46bf67b4ad667d741652250e68534d1bb98..84b986004385008c4651e2d0c4466ba477f213ca 100644 (file)
@@ -10,14 +10,7 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
 obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
 obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.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_EHEA) += ehea/
 obj-$(CONFIG_CAN) += can/
@@ -61,7 +54,6 @@ obj-$(CONFIG_SUNVNET) += sunvnet.o
 obj-$(CONFIG_MACE) += mace.o
 obj-$(CONFIG_BMAC) += bmac.o
 
-obj-$(CONFIG_E100) += e100.o
 obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_EPIC100) += epic100.o
 obj-$(CONFIG_SMSC9420) += smsc9420.o
index 69d6403ec4bdc0efb40d1e66d8faefec4f9aa391..a2fd38562cb3a5732391c62997210e6090a4ef01 100644 (file)
@@ -16,5 +16,6 @@ source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
+source "drivers/net/ethernet/intel/Kconfig"
 
 endif # ETHERNET
index 470e5d843013d272406515b2a4f8f73dc1ba589c..526527177d13dbf04225c57a238c692bfe54cb9b 100644 (file)
@@ -7,3 +7,4 @@ obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
+obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
new file mode 100644 (file)
index 0000000..5fe185b
--- /dev/null
@@ -0,0 +1,220 @@
+#
+# Intel network device configuration
+#
+
+config NET_VENDOR_INTEL
+       bool "Intel devices"
+       depends on PCI || PCI_MSI
+       ---help---
+         If you have a network (Ethernet) card belonging to this class, say Y
+         and read the Ethernet-HOWTO, available from
+         <http://www.tldp.org/docs.html#howto>.
+
+         Note that the answer to this question doesn't directly affect the
+         kernel: saying N will just cause the configurator to skip all
+         the questions about Intel cards. If you say Y, you will be asked for
+         your specific card in the following questions.
+
+if NET_VENDOR_INTEL
+
+config E100
+       tristate "Intel(R) PRO/100+ support"
+       depends on 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://www.intel.com/p/en_US/support/highlights/network/pro100plus>
+
+         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 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)
+       select CRC32
+       ---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/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.
+
+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 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.
+
+endif # NET_VENDOR_INTEL
diff --git a/drivers/net/ethernet/intel/Makefile b/drivers/net/ethernet/intel/Makefile
new file mode 100644 (file)
index 0000000..c8210e6
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Makefile for the Intel network device drivers.
+#
+
+obj-$(CONFIG_E100) += e100.o
+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/
similarity index 96%
rename from drivers/net/e1000e/Makefile
rename to drivers/net/ethernet/intel/e1000e/Makefile
index 28519acacd2d28f4eea74fd0fe4239c9d6ff1aa7..948c05db5d68cdc6318e814c5711948125eb4687 100644 (file)
@@ -32,6 +32,6 @@
 
 obj-$(CONFIG_E1000E) += e1000e.o
 
-e1000e-objs := 82571.o ich8lan.o es2lan.o \
+e1000e-objs := 82571.o ich8lan.o 80003es2lan.o \
               lib.o phy.o param.o ethtool.o netdev.o