This is a note to let you know that I've just added the patch titled
sfc: Rate-limit log message for PTP packets without a matching timestamp event
to the 3.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sfc-rate-limit-log-message-for-ptp-packets-without-a-matching-timestamp-event.patch
and it can be found in the queue-3.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Mon Jan 13 09:44:41 PST 2014
From: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri, 6 Dec 2013 22:10:46 +0000
Subject: sfc: Rate-limit log message for PTP packets without a matching timestamp event
From: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
[ Upstream commit 35f9a7a380728a94d417e5824a866f969423ac83 ]
In case of a flood of PTP packets, the timestamp peripheral and MC
firmware on the SFN[56]322F boards may not be able to provide
timestamp events for all packets. Don't complain too much about this.
Fixes: 7c236c43b838 ('sfc: Add support for IEEE-1588 PTP')
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/sfc/ptp.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/drivers/net/ethernet/sfc/ptp.c
+++ b/drivers/net/ethernet/sfc/ptp.c
@@ -717,8 +717,9 @@ static bool efx_ptp_process_events(struc
__skb_queue_tail(q, skb);
} else if (time_after(jiffies, match->expiry)) {
match->state = PTP_PACKET_STATE_TIMED_OUT;
- netif_warn(efx, rx_err, efx->net_dev,
- "PTP packet - no timestamp seen\n");
+ if (net_ratelimit())
+ netif_warn(efx, rx_err, efx->net_dev,
+ "PTP packet - no timestamp seen\n");
__skb_queue_tail(q, skb);
} else {
/* Replace unprocessed entry and stop */
Patches currently in stable-queue which might be from bhutchings@xxxxxxxxxxxxxx are
queue-3.12/sfc-refactor-efx_mcdi_poll-by-introducing-efx_mcdi_poll_once.patch
queue-3.12/sfc-poll-for-mcdi-completion-once-before-timeout-occurs.patch
queue-3.12/sfc-stop-re-start-ptp-when-stopping-starting-the-datapath.patch
queue-3.12/sfc-rx-buffer-allocation-takes-prefix-size-into-account-in-ip-header-alignment.patch
queue-3.12/sfc-add-length-checks-to-efx_xmit_with_hwtstamp-and-efx_ptp_is_ptp_tx.patch
queue-3.12/sfc-ptp-moderate-log-message-on-event-queue-overflow.patch
queue-3.12/sfc-rate-limit-log-message-for-ptp-packets-without-a-matching-timestamp-event.patch
queue-3.12/sfc-maintain-current-frequency-adjustment-when-applying-a-time-offset.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html