From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Oct 2010 21:17:12 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.37-rc1~32
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=1840897ab5d39b2e510c610ee262ded79919e718;hp=-c;p=net-next-2.6.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits)
  b43: Fix warning at drivers/mmc/core/core.c:237 in mmc_wait_for_cmd
  mac80211: fix failure to check kmalloc return value in key_key_read
  libertas: Fix sd8686 firmware reload
  ath9k: Fix incorrect access of rate flags in RC
  netfilter: xt_socket: Make tproto signed in socket_mt6_v1().
  stmmac: enable/disable rx/tx in the core with a single write.
  net: atarilance - flags should be unsigned long
  netxen: fix kdump
  pktgen: Limit how much data we copy onto the stack.
  net: Limit socket I/O iovec total length to INT_MAX.
  USB: gadget: fix ethernet gadget crash in gether_setup
  fib: Fix fib zone and its hash leak on namespace stop
  cxgb3: Fix panic in free_tx_desc()
  cxgb3: fix crash due to manipulating queues before registration
  8390: Don't oops on starting dev queue
  dccp ccid-2: Stop polling
  dccp: Refine the wait-for-ccid mechanism
  dccp: Extend CCID packet dequeueing interface
  dccp: Return-value convention of hc_tx_send_packet()
  igbvf: fix panic on load
  ...
---

1840897ab5d39b2e510c610ee262ded79919e718
diff --combined drivers/net/Kconfig
index 9334539ebf7,f24179d98db..f6668cdaac8
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -883,6 -883,14 +883,6 @@@ config BFIN_RX_DESC_NU
  	help
  	  Set the number of buffer packets used in driver.
  
 -config BFIN_MAC_RMII
 -	bool "RMII PHY Interface"
 -	depends on BFIN_MAC
 -	default y if BFIN527_EZKIT
 -	default n if BFIN537_STAMP
 -	help
 -	  Use Reduced PHY MII Interface
 -
  config BFIN_MAC_USE_HWSTAMP
  	bool "Use IEEE 1588 hwstamp"
  	depends on BFIN_MAC && BF518
@@@ -946,8 -954,6 +946,8 @@@ config NET_NET
  config TI_DAVINCI_EMAC
  	tristate "TI DaVinci EMAC Support"
  	depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
 +	select TI_DAVINCI_MDIO
 +	select TI_DAVINCI_CPDMA
  	select PHYLIB
  	help
  	  This driver supports TI's DaVinci Ethernet .
@@@ -955,25 -961,6 +955,25 @@@
  	  To compile this driver as a module, choose M here: the module
  	  will be called davinci_emac_driver.  This is recommended.
  
 +config TI_DAVINCI_MDIO
 +	tristate "TI DaVinci MDIO Support"
 +	depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
 +	select PHYLIB
 +	help
 +	  This driver supports TI's DaVinci MDIO module.
 +
 +	  To compile this driver as a module, choose M here: the module
 +	  will be called davinci_mdio.  This is recommended.
 +
 +config TI_DAVINCI_CPDMA
 +	tristate "TI DaVinci CPDMA Support"
 +	depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )
 +	help
 +	  This driver supports TI's DaVinci CPDMA dma engine.
 +
 +	  To compile this driver as a module, choose M here: the module
 +	  will be called davinci_cpdma.  This is recommended.
 +
  config DM9000
  	tristate "DM9000 support"
  	depends on ARM || BLACKFIN || MIPS
@@@ -1041,7 -1028,7 +1041,7 @@@ config SMC911
  	tristate "SMSC LAN911[5678] support"
  	select CRC32
  	select MII
 -	depends on ARM || SUPERH
 +	depends on ARM || SUPERH || MN10300
  	help
  	  This is a driver for SMSC's LAN911x series of Ethernet chipsets
  	  including the new LAN9115, LAN9116, LAN9117, and LAN9118.
@@@ -1055,7 -1042,7 +1055,7 @@@
  
  config SMSC911X
  	tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
 -	depends on ARM || SUPERH || BLACKFIN || MIPS
 +	depends on ARM || SUPERH || BLACKFIN || MIPS || MN10300
  	select CRC32
  	select MII
  	select PHYLIB
@@@ -1067,14 -1054,6 +1067,14 @@@
  	  <file:Documentation/networking/net-modules.txt>. The module
  	  will be called smsc911x.
  
 +config SMSC911X_ARCH_HOOKS
 +	def_bool n
 +	depends on SMSC911X
 +	help
 +	  If the arch enables this, it allows the arch to implement various
 +	  hooks for more comprehensive interrupt control and also to override
 +	  the source of the MAC address.
 +
  config NET_VENDOR_RACAL
  	bool "Racal-Interlan (Micom) NI cards"
  	depends on ISA
@@@ -2541,6 -2520,7 +2541,7 @@@ source "drivers/net/stmmac/Kconfig
  config PCH_GBE
  	tristate "PCH Gigabit Ethernet"
  	depends on PCI
+ 	select MII
  	---help---
  	  This is a gigabit ethernet driver for Topcliff PCH.
  	  Topcliff PCH is the platform controller hub that is used in Intel's