diff options
author | Jacob Keller <jacob.e.keller@intel.com> | 2012-09-21 03:23:20 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-10-03 11:35:00 -0400 |
commit | 1cc92eb871d6cbb1da038b4bcd89eec3c73b9781 (patch) | |
tree | fe69be18d2f6cdd8d241ff8a50005678c7930808 /drivers/net/ethernet | |
parent | db0677fa29862d29e9956980d9fab43c52179e34 (diff) |
ixgbe: fix PTP ethtool timestamping function
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.
CC: stable <stable@vger.kernel.org> [3.5]
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c index 4104ea25d818..56b20d17d0e4 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | |||
@@ -2690,10 +2690,7 @@ static int ixgbe_get_ts_info(struct net_device *dev, | |||
2690 | (1 << HWTSTAMP_FILTER_NONE) | | 2690 | (1 << HWTSTAMP_FILTER_NONE) | |
2691 | (1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) | | 2691 | (1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) | |
2692 | (1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) | | 2692 | (1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) | |
2693 | (1 << HWTSTAMP_FILTER_PTP_V2_SYNC) | | 2693 | (1 << HWTSTAMP_FILTER_PTP_V2_EVENT); |
2694 | (1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ) | | ||
2695 | (1 << HWTSTAMP_FILTER_PTP_V2_EVENT) | | ||
2696 | (1 << HWTSTAMP_FILTER_SOME); | ||
2697 | break; | 2694 | break; |
2698 | #endif /* CONFIG_IXGBE_PTP */ | 2695 | #endif /* CONFIG_IXGBE_PTP */ |
2699 | default: | 2696 | default: |