Commit 8e91f178 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: (21 commits)
  r8169: revert "r8169: read MAC address from EEPROM on init (2nd attempt)"
  r8169: use hardware auto-padding.
  igb: remove ASPM L0s workaround
  netxen: remove old flash check.
  mv643xx_eth: fix unicast address filter corruption on mtu change
  xfrm: Fix xfrm_state_find() wrt. wildcard source address.
  emac: Fix clock control for 405EX and 405EXr chips
  ixgbe: fix multiple unicast address support
  via-velocity: Fix DMA mapping length errors on transmit.
  qlge: bugfix: Pad outbound frames smaller than 60 bytes.
  qlge: bugfix: Move netif_napi_del() to common call point.
  qlge: bugfix: Tell hw to strip vlan header.
  qlge: bugfix: Increase filter on inbound csum.
  dnet: replace obsolete *netif_rx_* functions with *napi_*
  net: Add be2net driver.
  dnet: Fix warnings on 64-bit.
  dnet: Dave DNET ethernet controller driver (updated)
  ipv6:  Fix BUG when disabled ipv6 module is unloaded
  bnx2x: Using DMAE to initialize the chip
  bnx2x: Casting page alignment
  ...
parents 8032b526 ea8dbdd1

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -3876,6 +3876,15 @@ L: linux-ide@vger.kernel.org 
T:	git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git

S:	Supported



SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER

P:	Sathya Perla

M:	sathyap@serverengines.com

P:      Subbu Seetharaman

M:      subbus@serverengines.com

L:      netdev@vger.kernel.org

W:      http://www.serverengines.com

S:      Supported



SFC NETWORK DRIVER

P:	Steve Hodgson

P:	Ben Hutchings

drivers/net/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -1040,6 +1040,17 @@ config NI65 
	  To compile this driver as a module, choose M here. The module

	  will be called ni65.



config DNET

	tristate "Dave ethernet support (DNET)"

	depends on NET_ETHERNET

	select PHYLIB

	help

	  The Dave ethernet interface (DNET) is found on Qong Board FPGA.

	  Say Y to include support for the DNET chip.



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

	  will be called dnet.



source "drivers/net/tulip/Kconfig"



config AT1700
@@ -2619,6 +2630,8 @@ config QLGE 


source "drivers/net/sfc/Kconfig"



source "drivers/net/benet/Kconfig"



endif # NETDEV_10000



source "drivers/net/tokenring/Kconfig"

drivers/net/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ obj-$(CONFIG_GIANFAR) += gianfar_driver.o 
obj-$(CONFIG_TEHUTI) += tehuti.o

obj-$(CONFIG_ENIC) += enic/

obj-$(CONFIG_JME) += jme.o

obj-$(CONFIG_BE2NET) += benet/



gianfar_driver-objs := gianfar.o \

		gianfar_ethtool.o \
@@ -231,6 +232,7 @@ obj-$(CONFIG_ENC28J60) += enc28j60.o 


obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o



obj-$(CONFIG_DNET) += dnet.o

obj-$(CONFIG_MACB) += macb.o



obj-$(CONFIG_ARM) += arm/

drivers/net/benet/Kconfig

0 → 100644
+7 −0
Original line number Diff line number Diff line 
config BE2NET

	tristate "ServerEngines' 10Gbps NIC - BladeEngine 2"

	depends on PCI && INET

	select INET_LRO

	help

	This driver implements the NIC functionality for ServerEngines'

	10Gbps network adapter - BladeEngine 2.

drivers/net/benet/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#

# Makefile to build the network driver for ServerEngine's BladeEngine.

#



obj-$(CONFIG_BE2NET) += be2net.o



be2net-y :=  be_main.o be_cmds.o be_ethtool.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE