diff options
| author | David S. Miller | 2013-09-17 03:42:37 +0200 |
|---|---|---|
| committer | David S. Miller | 2013-09-17 03:43:54 +0200 |
| commit | 1ef68ec462571955f2a667ddf1ffe279848709d7 (patch) | |
| tree | 8879bdadfaea06316cbaa0eb1583806ce45d2cc0 /drivers/net/ethernet/sfc/Kconfig | |
| parent | net: sctp: rfc4443: do not report ICMP redirects to user space (diff) | |
| parent | sfc: Reinitialise and re-validate datapath caps after MC reboot (diff) | |
| download | kernel-qcow2-linux-1ef68ec462571955f2a667ddf1ffe279848709d7.tar.gz kernel-qcow2-linux-1ef68ec462571955f2a667ddf1ffe279848709d7.tar.xz kernel-qcow2-linux-1ef68ec462571955f2a667ddf1ffe279848709d7.zip | |
Merge branch 'sfc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc
Ben Hutchings says:
====================
Some bug fixes and future-proofing for the recently added SFC9120
support:
1. Minimal support for the 40G configuration.
2. Disable the incomplete PTP/hardware timestamping support.
3. Reset MAC stats properly after a firmware upgrade.
4. Re-check the datapath firmware capabilities after the controller is
reset.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/sfc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig index 8b7152565c5e..088921294448 100644 --- a/drivers/net/ethernet/sfc/Kconfig +++ b/drivers/net/ethernet/sfc/Kconfig @@ -7,7 +7,7 @@ config SFC select I2C_ALGOBIT select PTP_1588_CLOCK ---help--- - This driver supports 10-gigabit Ethernet cards based on + This driver supports 10/40-gigabit Ethernet cards based on the Solarflare SFC4000, SFC9000-family and SFC9100-family controllers. |