Skip to content

Commit 0da34b6

Browse files
Brice GoglinJeff Garzik
authored andcommitted
[PATCH] Add Myri-10G Ethernet driver
Signed-off-by: Brice Goglin <[email protected]> Signed-off-by: Andrew J. Gallatin <[email protected]> drivers/net/Kconfig | 17 drivers/net/Makefile | 1 drivers/net/myri10ge/Makefile | 5 drivers/net/myri10ge/myri10ge.c | 2851 +++++++++++++++ drivers/net/myri10ge/myri10ge_mcp.h | 205 + drivers/net/myri10ge/myri10ge_mcp_gen_header.h | 58 include/linux/pci_ids.h | 1 7 files changed, 3138 insertions(+) Signed-off-by: Jeff Garzik <[email protected]>
1 parent 3a720d7 commit 0da34b6

File tree

7 files changed

+3138
-0
lines changed

7 files changed

+3138
-0
lines changed

drivers/net/Kconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2327,6 +2327,23 @@ config S2IO_NAPI
23272327

23282328
If in doubt, say N.
23292329

2330+
config MYRI10GE
2331+
tristate "Myricom Myri-10G Ethernet support"
2332+
depends on PCI
2333+
select FW_LOADER
2334+
select CRC32
2335+
---help---
2336+
This driver supports Myricom Myri-10G Dual Protocol interface in
2337+
Ethernet mode. If the eeprom on your board is not recent enough,
2338+
you will need a newer firmware image.
2339+
You may get this image or more information, at:
2340+
2341+
<http://www.myri.com/Myri-10G/>
2342+
2343+
To compile this driver as a module, choose M here and read
2344+
<file:Documentation/networking/net-modules.txt>. The module
2345+
will be called myri10ge.
2346+
23302347
endmenu
23312348

23322349
source "drivers/net/tokenring/Kconfig"

drivers/net/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ obj-$(CONFIG_R8169) += r8169.o
192192
obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
193193
obj-$(CONFIG_IBMVETH) += ibmveth.o
194194
obj-$(CONFIG_S2IO) += s2io.o
195+
obj-$(CONFIG_MYRI10GE) += myri10ge/
195196
obj-$(CONFIG_SMC91X) += smc91x.o
196197
obj-$(CONFIG_SMC911X) += smc911x.o
197198
obj-$(CONFIG_DM9000) += dm9000.o

drivers/net/myri10ge/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#
2+
# Makefile for the Myricom Myri-10G ethernet driver
3+
#
4+
5+
obj-$(CONFIG_MYRI10GE) += myri10ge.o

0 commit comments

Comments
 (0)