[Gc-linux-cvs] linux/drivers/net Kconfig, 1.39, 1.40 Makefile, 1.33, 1.34

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/gc-linux/linux/drivers/net
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29988/drivers/net

Modified Files:
	Kconfig Makefile 
Log Message:
Forward to v.2.6.30.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Makefile	25 Oct 2009 18:33:47 -0000	1.33
--- Makefile	25 Oct 2009 18:45:35 -0000	1.34
***************
*** 7,10 ****
--- 7,11 ----
  obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
  obj-$(CONFIG_IGB) += igb/
+ obj-$(CONFIG_IGBVF) += igbvf/
  obj-$(CONFIG_IXGBE) += ixgbe/
  obj-$(CONFIG_IXGB) += ixgb/
***************
*** 27,35 ****
  gianfar_driver-objs := gianfar.o \
  		gianfar_ethtool.o \
- 		gianfar_mii.o \
  		gianfar_sysfs.o
  
  obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
! ucc_geth_driver-objs := ucc_geth.o ucc_geth_mii.o ucc_geth_ethtool.o
  
  #
--- 28,37 ----
  gianfar_driver-objs := gianfar.o \
  		gianfar_ethtool.o \
  		gianfar_sysfs.o
  
  obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
! ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o
! 
! obj-$(CONFIG_FSL_PQ_MDIO) += fsl_pq_mdio.o
  
  #
***************
*** 101,105 ****
  obj-$(CONFIG_SEEQ8005) += seeq8005.o
  obj-$(CONFIG_NET_SB1000) += sb1000.o
! obj-$(CONFIG_MAC8390) += mac8390.o 8390.o
  obj-$(CONFIG_APNE) += apne.o 8390.o
  obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
--- 103,107 ----
  obj-$(CONFIG_SEEQ8005) += seeq8005.o
  obj-$(CONFIG_NET_SB1000) += sb1000.o
! obj-$(CONFIG_MAC8390) += mac8390.o
  obj-$(CONFIG_APNE) += apne.o 8390.o
  obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
***************
*** 220,223 ****
--- 222,226 ----
  obj-$(CONFIG_IBMVETH) += ibmveth.o
  obj-$(CONFIG_S2IO) += s2io.o
+ obj-$(CONFIG_VXGE) += vxge/
  obj-$(CONFIG_MYRI10GE) += myri10ge/
  obj-$(CONFIG_SMC91X) += smc91x.o
***************
*** 230,233 ****
--- 233,237 ----
  obj-$(CONFIG_MLX4_CORE) += mlx4/
  obj-$(CONFIG_ENC28J60) += enc28j60.o
+ obj-$(CONFIG_ETHOC) += ethoc.o
  
  obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Kconfig	25 Oct 2009 18:33:47 -0000	1.39
--- Kconfig	25 Oct 2009 18:45:35 -0000	1.40
***************
*** 27,30 ****
--- 27,39 ----
  if NETDEVICES
  
+ config COMPAT_NET_DEV_OPS
+        default y
+        bool "Enable older network device API compatibility"
+        ---help---
+           This option enables kernel compatibility with older network devices
+           that do not use net_device_ops interface.
+ 
+ 	  If unsure, say Y.
+ 
  config IFB
  	tristate "Intermediate Functional Block support"
***************
*** 964,967 ****
--- 973,986 ----
  	  If unsure, say N.
  
+ config ETHOC
+ 	tristate "OpenCores 10/100 Mbps Ethernet MAC support"
+ 	depends on NET_ETHERNET && HAS_IOMEM
+ 	select MII
+ 	select PHYLIB
+ 	select CRC32
+ 	select BITREVERSE
+ 	help
+ 	  Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
+ 
  config SMC911X
  	tristate "SMSC LAN911[5678] support"
***************
*** 1841,1848 ****
  config FEC
  	bool "FEC ethernet controller (of ColdFire CPUs)"
! 	depends on M523x || M527x || M5272 || M528x || M520x || M532x
  	help
  	  Say Y here if you want to use the built-in 10/100 Fast ethernet
! 	  controller on some Motorola ColdFire processors.
  
  config FEC2
--- 1860,1867 ----
  config FEC
  	bool "FEC ethernet controller (of ColdFire CPUs)"
! 	depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27
  	help
  	  Say Y here if you want to use the built-in 10/100 Fast ethernet
! 	  controller on some Motorola ColdFire and Freescale i.MX processors.
  
  config FEC2
***************
*** 2031,2043 ****
           will be called igb.
  
- config IGB_LRO 
- 	bool "Use software LRO"
- 	depends on IGB && INET
- 	select INET_LRO
- 	---help---
- 	  Say Y here if you want to use large receive offload. 
- 
- 	  If in doubt, say N.
- 
  config IGB_DCA
  	bool "Direct Cache Access (DCA) Support"
--- 2050,2053 ----
***************
*** 2049,2052 ****
--- 2059,2083 ----
  	  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"
  
***************
*** 2227,2231 ****
  	depends on PCI
  	select CRC32
! 	select ZLIB_INFLATE
  	help
  	  This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
--- 2258,2262 ----
  	depends on PCI
  	select CRC32
! 	select FW_LOADER
  	help
  	  This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
***************
*** 2285,2291 ****
--- 2316,2330 ----
            If unsure, say N.
  
+ config FSL_PQ_MDIO
+ 	tristate "Freescale PQ MDIO"
+ 	depends on FSL_SOC
+ 	select PHYLIB
+ 	help
+ 	  This driver supports the MDIO bus used by the gianfar and UCC drivers.
+ 
  config GIANFAR
  	tristate "Gianfar Ethernet"
  	depends on FSL_SOC
+ 	select FSL_PQ_MDIO
  	select PHYLIB
  	select CRC32
***************
*** 2297,2300 ****
--- 2336,2340 ----
  	tristate "Freescale QE Gigabit Ethernet"
  	depends on QUICC_ENGINE
+ 	select FSL_PQ_MDIO
  	select PHYLIB
  	help
***************
*** 2313,2316 ****
--- 2353,2357 ----
  	tristate "Marvell Discovery (643XX) and Orion ethernet support"
  	depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION
+ 	select INET_LRO
  	select PHYLIB
  	help
***************
*** 2431,2435 ****
  	depends on CHELSIO_T3_DEPENDS
  	select FW_LOADER
- 	select INET_LRO
  	help
  	  This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
--- 2472,2475 ----
***************
*** 2467,2471 ****
  	tristate "Intel(R) 10GbE PCI Express adapters support"
  	depends on PCI && INET
- 	select INET_LRO
  	---help---
  	  This driver supports Intel(R) 10GbE PCI Express family of
--- 2507,2510 ----
***************
*** 2532,2535 ****
--- 2571,2591 ----
  	  <file:Documentation/networking/s2io.txt>.
  
+ config VXGE
+ 	tristate "Neterion X3100 Series 10GbE PCIe Server Adapter"
+ 	depends on PCI && INET
+ 	---help---
+ 	  This driver supports Neterion Inc's X3100 Series 10 GbE PCIe
+ 	  I/O Virtualized Server Adapter.
+ 	  More specific information on configuring the driver is in
+ 	  <file:Documentation/networking/vxge.txt>.
+ 
+ config VXGE_DEBUG_TRACE_ALL
+ 	bool "Enabling All Debug trace statments in driver"
+ 	default n
+ 	depends on VXGE
+ 	---help---
+ 	  Say Y here if you want to enabling all the debug trace statements in
+ 	  driver. By  default only few debug trace statements are enabled.
+ 
  config MYRI10GE
  	tristate "Myricom Myri-10G Ethernet support"