Signed-off-by: Subbu Seetharaman <subbus@serverengines.com> --- MAINTAINERS | 7 +++++++ drivers/net/Kconfig | 17 +++++++++++++++++ drivers/net/Makefile | 1 + 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index bc1c008..95de067 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3593,6 +3593,13 @@ L: linux-ide@vger.kernel.org T: git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git S: Supported +SERVER ENGINES 10Gbe NIC - BLADE-ENGINE +P: Subbu Seetharaman +M: subbus@serverengines.com +L: netdev@vger.kernel.org +W: http://www.serverengines.com +S: Supported + SGI SN-IA64 (Altix) SERIAL CONSOLE DRIVER P: Pat Gefre M: pfg@sgi.com diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 9f6cc8a..c2b3699 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2581,6 +2581,23 @@ config BNX2X source "drivers/net/sfc/Kconfig" +config BENET + tristate "ServerEngines 10Gb NIC - BladeEngine" + depends on PCI + select INET_LRO + help + This driver implements the NIC functionality for ServerEngines + 10Gb network adapter BladeEngine (EC 3210). + +config BENET_NAPI + bool "Use Rx Polling (NAPI) for benet" + depends on BENET + default y + help + NAPI is a new driver API designed to reduce CPU and interrupt load + when the driver is receiving lots of packets from the card. Selecting + this feature will give better performance in high traffic conditions. + endif # NETDEV_10000 source "drivers/net/tokenring/Kconfig" diff --git a/drivers/net/Makefile b/drivers/net/Makefile index dcbfe84..8f3c1ff 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -18,6 +18,7 @@ obj-$(CONFIG_BONDING) += bonding/ obj-$(CONFIG_ATL1) += atlx/ obj-$(CONFIG_GIANFAR) += gianfar_driver.o obj-$(CONFIG_TEHUTI) += tehuti.o +obj-$(CONFIG_BENET) += benet/ gianfar_driver-objs := gianfar.o \ gianfar_ethtool.o \ -- 1.5.5 ___________________________________________________________________________________ This message, together with any attachment(s), contains confidential and proprietary information of ServerEngines Corporation and is intended only for the designated recipient(s) named above. Any unauthorized review, printing, retention, copying, disclosure or distribution is strictly prohibited. If you are not the intended recipient of this message, please immediately advise the sender by reply email message and delete all copies of this message and any attachment(s). Thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
| Dave Hansen | Re: [RFC/PATCH] Documentation of kernel messages |
| Ingo Molnar | [patch] CFS scheduler, -v19 |
| Karl Meyer | PROBLEM: 2.6.23-rc "NETDEV WATCHDOG: eth0: transmit timed out" |
| Greg KH | [patch 02/60] SCSI: ses: fix VPD inquiry overrun |
git: | |
| Linus Torvalds | Re: git on MacOSX and files with decomposed utf-8 file names |
| Matthieu Moy | git push to a non-bare repository |
| linux | Re: Change set based shallow clone |
| Jon Smirl | Something is broken in repack |
| GVG GVG | ssh_exchange_identification: Connection closed by remote host |
| Otto Moerbeek | Re: identifying sparse files and get ride of them trick available? |
| Richard Stallman | Real men don't attack straw men |
| Jon Morby | IPv6 and OpenBGPD - Protocol not available |
| Linux Kernel Mailing List | [ALSA] hda - Fix ALC262 fujitsu model |
| Linux Kernel Mailing List | USB Serial Sierra: clean-up |
| Linux Kernel Mailing List | ssb: Fix watchdog access for devices without a chipcommon |
| Linux Kernel Mailing List | USB Serial Sierra: Dynamic interface detection |
