From 4ad9b88fd6375605ea9c96b63575308caf644c37 Mon Sep 17 00:00:00 2001 From: Jiri Benc Date: Thu, 25 Oct 2012 18:12:05 +0000 Subject: [PATCH] --- yaml --- r: 340557 b: refs/heads/master c: f42df16756dbcaba7b50cb7bbb0833b65d3ae167 h: refs/heads/master i: 340555: 6ce2d1178f5a863ac7b8aebaee7419adb6604f98 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9aaf08d2a516..fe696e484a5c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39ac868a7c8c8b7406205b7b4c09417a0df0dec0 +refs/heads/master: f42df16756dbcaba7b50cb7bbb0833b65d3ae167 diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c index 5e71ddbb3414..842ba15550a5 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c @@ -554,12 +554,14 @@ void ixgbe_ptp_rx_hwtstamp(struct ixgbe_q_vector *q_vector, adapter = q_vector->adapter; hw = &adapter->hw; + if (likely(!ixgbe_ptp_match(skb, adapter->rx_hwtstamp_filter))) + return; + tsyncrxctl = IXGBE_READ_REG(hw, IXGBE_TSYNCRXCTL); /* Check if we have a valid timestamp and make sure the skb should * have been timestamped */ - if (likely(!(tsyncrxctl & IXGBE_TSYNCRXCTL_VALID) || - !ixgbe_ptp_match(skb, adapter->rx_hwtstamp_filter))) + if (!(tsyncrxctl & IXGBE_TSYNCRXCTL_VALID)) return; /*