This is a note to let you know that I've just added the patch titled

    ixgbe: fix PTP ethtool timestamping function

to the 3.5-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:
     ixgbe-fix-ptp-ethtool-timestamping-function.patch
and it can be found in the queue-3.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From 1cc92eb871d6cbb1da038b4bcd89eec3c73b9781 Mon Sep 17 00:00:00 2001
From: Jacob Keller <[email protected]>
Date: Fri, 21 Sep 2012 07:23:20 +0000
Subject: ixgbe: fix PTP ethtool timestamping function

From: Jacob Keller <[email protected]>

commit 1cc92eb871d6cbb1da038b4bcd89eec3c73b9781 upstream.

This patch fixes a development issue that occurred due to invalid modes reported
in the ethtool get_ts_info function. The issue is resolved by removing
unsupported modes from the Rx supported list.

Signed-off-by: Jacob Keller <[email protected]>
Tested-by: Phil Schmitt <[email protected]>
Signed-off-by: Jeff Kirsher <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -2723,10 +2723,7 @@ static int ixgbe_get_ts_info(struct net_
                        (1 << HWTSTAMP_FILTER_NONE) |
                        (1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) |
                        (1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) |
-                       (1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |
-                       (1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ) |
-                       (1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |
-                       (1 << HWTSTAMP_FILTER_SOME);
+                       (1 << HWTSTAMP_FILTER_PTP_V2_EVENT);
                break;
 #endif /* CONFIG_IXGBE_PTP */
        default:


Patches currently in stable-queue which might be from [email protected] 
are

queue-3.5/ixgbe-fix-ptp-ethtool-timestamping-function.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to