From bd9fd3f618843c8f06737b85d101950fec9dbc6b Mon Sep 17 00:00:00 2001 From: Jacob Keller Date: Thu, 15 Nov 2012 01:10:37 +0000 Subject: [PATCH] --- yaml --- r: 351639 b: refs/heads/master c: aeb8264847c0194e42c8023cea89305c377f20e3 h: refs/heads/master i: 351637: ef3dcd5913252e125bda1f81295b132f66952df8 351635: 88c0b5106c98698cc4ef54eee72d2f81fb550b42 351631: 63edcc70f7214d198644e97442e00cf9c67fc2f9 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5a95313fd1c0..091acd099198 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfcc4615f09c33454bc553567f7c7506cae60cb9 +refs/heads/master: aeb8264847c0194e42c8023cea89305c377f20e3 diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c index 21bc72e99c2e..1513b1052ee2 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c @@ -2709,6 +2709,14 @@ static int ixgbe_get_ts_info(struct net_device *dev, (1 << HWTSTAMP_FILTER_NONE) | (1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) | (1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) | + (1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) | + (1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT) | + (1 << HWTSTAMP_FILTER_PTP_V2_SYNC) | + (1 << HWTSTAMP_FILTER_PTP_V2_L2_SYNC) | + (1 << HWTSTAMP_FILTER_PTP_V2_L4_SYNC) | + (1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ) | + (1 << HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ) | + (1 << HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ) | (1 << HWTSTAMP_FILTER_PTP_V2_EVENT); break; default: