mbox

Pull request: sfc 2013-12-10

Message ID 1386726714.1516.236.camel@bwh-desktop.uk.level5networks.com
State Accepted, archived
Delegated to: David Miller
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc.git sfc-3.13

Message

Ben Hutchings Dec. 11, 2013, 1:51 a.m. UTC
The following changes since commit e1ca87bb1b64b044163e686ff3bb71405156c561:

  Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (2013-12-05 16:02:56 -0500)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc.git sfc-3.13

for you to fetch changes up to 6b294b8efedaa7cf7507154148e2c79766ad6f96:

  sfc: Poll for MCDI completion once before timeout occurs (2013-12-06 22:27:55 +0000)

Several fixes for the PTP hardware support added in 3.7:
1. Fix filtering of PTP packets on the TX path to be robust against bad
header lengths.
2. Limit logging on the RX path in case of a PTP packet flood, partly
from Laurence Evans.
3. Disable PTP hardware when the interface is down so that we don't
receive RX timestamp events, from Alexandre Rames.
4. Maintain clock frequency adjustment when a time offset is applied.

Also fixes for the SFC9100 family support added in 3.12:
5. Take the RX prefix length into account when applying NET_IP_ALIGN,
from Andrew Rybchenko.
6. Work around a bug that breaks communication between the driver and
firmware, from Robert Stonehouse.

Please also queue these up for the appropriate stable branches.

Ben.

----------------------------------------------------------------
Alexandre Rames (1):
      sfc: Stop/re-start PTP when stopping/starting the datapath.

Andrew Rybchenko (1):
      sfc: RX buffer allocation takes prefix size into account in IP header alignment

Ben Hutchings (3):
      sfc: Add length checks to efx_xmit_with_hwtstamp() and efx_ptp_is_ptp_tx()
      sfc: Rate-limit log message for PTP packets without a matching timestamp event
      sfc: Maintain current frequency adjustment when applying a time offset

Laurence Evans (1):
      sfc: PTP: Moderate log message on event queue overflow

Robert Stonehouse (2):
      sfc: Refactor efx_mcdi_poll() by introducing efx_mcdi_poll_once()
      sfc: Poll for MCDI completion once before timeout occurs

 drivers/net/ethernet/sfc/efx.c        |  8 ++++-
 drivers/net/ethernet/sfc/mcdi.c       | 39 +++++++++++++++------
 drivers/net/ethernet/sfc/net_driver.h |  3 ++
 drivers/net/ethernet/sfc/nic.h        |  2 ++
 drivers/net/ethernet/sfc/ptp.c        | 66 ++++++++++++++++++++++++++++++-----
 drivers/net/ethernet/sfc/rx.c         |  6 ++--
 6 files changed, 101 insertions(+), 23 deletions(-)

Comments

David Miller Dec. 11, 2013, 2:21 a.m. UTC | #1
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 11 Dec 2013 01:51:54 +0000

>   git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc.git sfc-3.13
 ...
> Several fixes for the PTP hardware support added in 3.7:
> 1. Fix filtering of PTP packets on the TX path to be robust against bad
> header lengths.
> 2. Limit logging on the RX path in case of a PTP packet flood, partly
> from Laurence Evans.
> 3. Disable PTP hardware when the interface is down so that we don't
> receive RX timestamp events, from Alexandre Rames.
> 4. Maintain clock frequency adjustment when a time offset is applied.
> 
> Also fixes for the SFC9100 family support added in 3.12:
> 5. Take the RX prefix length into account when applying NET_IP_ALIGN,
> from Andrew Rybchenko.
> 6. Work around a bug that breaks communication between the driver and
> firmware, from Robert Stonehouse.
> 
> Please also queue these up for the appropriate stable branches.

Pulled and queued up for -stable, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html