summaryrefslogtreecommitdiffstats
path: root/drivers/net/vmxnet3
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-09-16 21:42:37 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-16 21:43:54 -0400
commit1ef68ec462571955f2a667ddf1ffe279848709d7 (patch)
tree8879bdadfaea06316cbaa0eb1583806ce45d2cc0 /drivers/net/vmxnet3
parent3f96a532113131d5a65ac9e00fc83cfa31b0295f (diff)
parenta915ccc9f2c80aa4c329262d89f93ea16d8792c9 (diff)
downloadlinux-1ef68ec462571955f2a667ddf1ffe279848709d7.tar.bz2
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/vmxnet3')
0 files changed, 0 insertions, 0 deletions