diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-09-16 21:42:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-16 21:43:54 -0400 |
| commit | 1ef68ec462571955f2a667ddf1ffe279848709d7 (patch) | |
| tree | 8879bdadfaea06316cbaa0eb1583806ce45d2cc0 /drivers/net/loopback.c | |
| 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 | linux-dev-1ef68ec462571955f2a667ddf1ffe279848709d7.tar.xz linux-dev-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/loopback.c')
0 files changed, 0 insertions, 0 deletions