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

Commit c3da3148 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: (53 commits)
  vmxnet: fix 2 build problems
  net: add support for STMicroelectronics Ethernet controllers.
  net: ks8851_mll uses mii interfaces
  net/fec_mpc52xx: Fix kernel panic on FEC error
  net: Fix OF platform drivers coldplug/hotplug when compiled as modules
  TI DaVinci EMAC: Clear statistics register properly.
  r8169: partial support and phy init for the 8168d
  irda/sa1100_ir: check return value of startup hook
  udp: Fix udp_poll() and ioctl()
  WAN: fix Cisco HDLC handshaking.
  tcp: fix tcp_defer_accept to consider the timeout
  3c574_cs: spin_lock the set_multicast_list function
  net: Teach pegasus driver to ignore bluetoother adapters with clashing Vendor:Product IDs
  netxen: fix pci bar mapping
  ethoc: fix warning from 32bit build
  libertas: fix build
  net: VMware virtual Ethernet NIC driver: vmxnet3
  net: Fix IXP 2000 network driver building.
  libertas: fix build
  mac80211: document ieee80211_rx() context requirement
  ...
parents bd070411 8f7e524c

MAINTAINERS

+8 −0
Original line number Original line Diff line number Diff line
@@ -3667,6 +3667,7 @@ NETWORKING [GENERAL] 
M:	"David S. Miller" <davem@davemloft.net>

M:	"David S. Miller" <davem@davemloft.net>

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

W:	http://www.linuxfoundation.org/en/Net

W:	http://www.linuxfoundation.org/en/Net

W:	http://patchwork.ozlabs.org/project/netdev/list/

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

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

S:	Maintained

S:	Maintained

F:	net/

F:	net/
@@ -5664,6 +5665,13 @@ S: Maintained 
F:	drivers/vlynq/vlynq.c

F:	drivers/vlynq/vlynq.c

F:	include/linux/vlynq.h

F:	include/linux/vlynq.h





VMWARE VMXNET3 ETHERNET DRIVER

M:     Shreyas Bhatewara <sbhatewara@vmware.com>

M:     VMware, Inc. <pv-drivers@vmware.com>

L:     netdev@vger.kernel.org

S:     Maintained

F:     drivers/net/vmxnet3/



VOLTAGE AND CURRENT REGULATOR FRAMEWORK

VOLTAGE AND CURRENT REGULATOR FRAMEWORK

M:	Liam Girdwood <lrg@slimlogic.co.uk>

M:	Liam Girdwood <lrg@slimlogic.co.uk>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

drivers/net/Kconfig

+11 −0
Original line number Original line Diff line number Diff line
@@ -1741,6 +1741,7 @@ config KS8851 
config KS8851_MLL

config KS8851_MLL

	tristate "Micrel KS8851 MLL"

	tristate "Micrel KS8851 MLL"

	depends on HAS_IOMEM

	depends on HAS_IOMEM

	select MII

	help

	help

	  This platform driver is for Micrel KS8851 Address/data bus

	  This platform driver is for Micrel KS8851 Address/data bus

	  multiplexed network chip.

	  multiplexed network chip.
@@ -2482,6 +2483,8 @@ config S6GMAC 
	  To compile this driver as a module, choose M here. The module

	  To compile this driver as a module, choose M here. The module

	  will be called s6gmac.

	  will be called s6gmac.





source "drivers/net/stmmac/Kconfig"



endif # NETDEV_1000

endif # NETDEV_1000





#

#
@@ -3230,4 +3233,12 @@ config VIRTIO_NET 
	  This is the virtual network driver for virtio.  It can be used with

	  This is the virtual network driver for virtio.  It can be used with

          lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.

          lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.





config VMXNET3

       tristate "VMware VMXNET3 ethernet driver"

       depends on PCI && X86 && INET

       help

         This driver supports VMware's vmxnet3 virtual ethernet NIC.

         To compile this driver as a module, choose M here: the

         module will be called vmxnet3.



endif # NETDEVICES
 
endif # NETDEVICES

drivers/net/Makefile

+6 −4
Original line number Original line Diff line number Diff line
@@ -2,6 +2,10 @@ 
# Makefile for the Linux network (ethercard) device drivers.

# Makefile for the Linux network (ethercard) device drivers.

#

#





obj-$(CONFIG_MII) += mii.o

obj-$(CONFIG_MDIO) += mdio.o

obj-$(CONFIG_PHYLIB) += phy/



obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o

obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o





obj-$(CONFIG_E1000) += e1000/

obj-$(CONFIG_E1000) += e1000/
@@ -26,6 +30,7 @@ obj-$(CONFIG_TEHUTI) += tehuti.o 
obj-$(CONFIG_ENIC) += enic/

obj-$(CONFIG_ENIC) += enic/

obj-$(CONFIG_JME) += jme.o

obj-$(CONFIG_JME) += jme.o

obj-$(CONFIG_BE2NET) += benet/

obj-$(CONFIG_BE2NET) += benet/

obj-$(CONFIG_VMXNET3) += vmxnet3/





gianfar_driver-objs := gianfar.o \

gianfar_driver-objs := gianfar.o \

		gianfar_ethtool.o \

		gianfar_ethtool.o \
@@ -95,15 +100,12 @@ obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o 
obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o

obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o

obj-$(CONFIG_RIONET) += rionet.o

obj-$(CONFIG_RIONET) += rionet.o

obj-$(CONFIG_SH_ETH) += sh_eth.o

obj-$(CONFIG_SH_ETH) += sh_eth.o

obj-$(CONFIG_STMMAC_ETH) += stmmac/





#

#

# end link order section

# end link order section

#

#





obj-$(CONFIG_MII) += mii.o

obj-$(CONFIG_MDIO) += mdio.o

obj-$(CONFIG_PHYLIB) += phy/



obj-$(CONFIG_SUNDANCE) += sundance.o

obj-$(CONFIG_SUNDANCE) += sundance.o

obj-$(CONFIG_HAMACHI) += hamachi.o

obj-$(CONFIG_HAMACHI) += hamachi.o

obj-$(CONFIG_NET) += Space.o loopback.o

obj-$(CONFIG_NET) += Space.o loopback.o

drivers/net/acenic.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1209,7 +1209,8 @@ static int __devinit ace_init(struct net_device *dev) 
	memset(ap->info, 0, sizeof(struct ace_info));

	memset(ap->info, 0, sizeof(struct ace_info));

	memset(ap->skb, 0, sizeof(struct ace_skb));

	memset(ap->skb, 0, sizeof(struct ace_skb));





	if (ace_load_firmware(dev))

	ecode = ace_load_firmware(dev);

	if (ecode)

		goto init_error;

		goto init_error;





	ap->fw_running = 0;

	ap->fw_running = 0;

drivers/net/can/sja1000/sja1000_of_platform.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -213,6 +213,7 @@ static struct of_device_id __devinitdata sja1000_ofp_table[] = { 
	{.compatible = "nxp,sja1000"},

	{.compatible = "nxp,sja1000"},

	{},

	{},

};

};

MODULE_DEVICE_TABLE(of, sja1000_ofp_table);





static struct of_platform_driver sja1000_ofp_driver = {

static struct of_platform_driver sja1000_ofp_driver = {

	.owner = THIS_MODULE,

	.owner = THIS_MODULE,