New driver "sfc" for Solarstorm SFC4000 controller.

The driver supports the 10Xpress PHY and XFP modules on our reference
designs SFE4001 and SFE4002 and the SMC models SMC10GPCIe-XFP and
SMC10GPCIe-10BT.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 36aadf6..2112034 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3522,6 +3522,13 @@ M:       pfg@sgi.com
 L:     linux-ia64@vger.kernel.org
 S:     Supported
 
+SFC NETWORK DRIVER
+P:     Steve Hodgson
+P:     Ben Hutchings
+P:     Robert Stonehouse
+M:     linux-net-drivers@solarflare.com
+S:     Supported
+
 SGI VISUAL WORKSTATION 320 AND 540
 P:     Andrey Panin
 M:     pazke@donpac.ru

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 45c3a20..50b36b4 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2592,6 +2592,7 @@ config BNX2X
          To compile this driver as a module, choose M here: the module
          will be called bnx2x.  This is recommended.
 
+source "drivers/net/sfc/Kconfig"
 
 endif # NETDEV_10000
 

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 4d71729..371cb07 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -252,3 +252,5 @@ obj-$(CONFIG_FS_ENET) += fs_enet/
 obj-$(CONFIG_NETXEN_NIC) += netxen/
 obj-$(CONFIG_NIU) += niu.o
 obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
+obj-$(CONFIG_SFC) += sfc/
+

diff --git a/drivers/net/sfc/Kconfig b/drivers/net/sfc/Kconfig
new file mode 100644 (file)
index 0000000..dbad95c
--- /dev/null
+++ b/drivers/net/sfc/Kconfig
@@ -0,0 +1,12 @@
+config SFC
+       tristate "Solarflare Solarstorm SFC4000 support"
+       depends on PCI && INET
+       select MII
+       select INET_LRO
+       select CRC32
+       help
+         This driver supports 10-gigabit Ethernet cards based on
+         the Solarflare Communications Solarstorm SFC4000 controller.
+
+         To compile this driver as a module, choose M here.  The module
+         will be called sfc.

diff --cc drivers/net/sfc/Makefile
Simple merge

diff --cc drivers/net/sfc/bitfield.h
Simple merge

diff --cc drivers/net/sfc/boards.c
Simple merge

diff --cc drivers/net/sfc/boards.h
Simple merge

diff --cc drivers/net/sfc/efx.c
Simple merge

diff --cc drivers/net/sfc/efx.h
Simple merge

diff --cc drivers/net/sfc/enum.h
Simple merge

diff --cc drivers/net/sfc/ethtool.c
Simple merge

diff --cc drivers/net/sfc/ethtool.h
Simple merge

diff --cc drivers/net/sfc/falcon.c
Simple merge

diff --cc drivers/net/sfc/falcon.h
Simple merge

diff --cc drivers/net/sfc/falcon_hwdefs.h
Simple merge

diff --cc drivers/net/sfc/falcon_io.h
Simple merge

diff --cc drivers/net/sfc/falcon_xmac.c
Simple merge

diff --cc drivers/net/sfc/gmii.h
Simple merge

diff --cc drivers/net/sfc/i2c-direct.c
Simple merge

diff --cc drivers/net/sfc/i2c-direct.h
Simple merge

diff --cc drivers/net/sfc/mac.h
Simple merge

diff --cc drivers/net/sfc/mdio_10g.c
Simple merge

diff --cc drivers/net/sfc/mdio_10g.h
Simple merge

diff --cc drivers/net/sfc/net_driver.h
Simple merge

diff --cc drivers/net/sfc/phy.h
Simple merge

diff --cc drivers/net/sfc/rx.c
Simple merge

diff --cc drivers/net/sfc/rx.h
Simple merge

diff --cc drivers/net/sfc/sfe4001.c
Simple merge

diff --cc drivers/net/sfc/spi.h
Simple merge

diff --cc drivers/net/sfc/tenxpress.c
Simple merge

diff --cc drivers/net/sfc/tx.c
Simple merge

diff --cc drivers/net/sfc/tx.h
Simple merge

diff --cc drivers/net/sfc/workarounds.h
Simple merge

diff --cc drivers/net/sfc/xenpack.h
Simple merge

diff --cc drivers/net/sfc/xfp_phy.c
Simple merge