Skip to content

Commit

Permalink
pch_gbe: simplify transmit time stamping flag test
Browse files Browse the repository at this point in the history
This patch makes logic surrounding the test of the
transmit time stamping flag more readable.

[ RC - Rebased Takahiro's changes and wrote a commit message
  explaining the changes. ]

Signed-off-by: Takahiro Shimizu <tshimizu818@gmail.com>
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Takahiro Shimizu authored and David S. Miller committed Apr 21, 2012
1 parent d50566c commit 5481c8c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,11 @@ static void pch_tx_timestamp(
u32 cnt, val;

shtx = skb_shinfo(skb);
if (unlikely(shtx->tx_flags & SKBTX_HW_TSTAMP && adapter->hwts_tx_en))
shtx->tx_flags |= SKBTX_IN_PROGRESS;
else
if (likely(!(shtx->tx_flags & SKBTX_HW_TSTAMP && adapter->hwts_tx_en)))
return;

shtx->tx_flags |= SKBTX_IN_PROGRESS;

/* Get ieee1588's dev information */
pdev = adapter->ptp_pdev;

Expand Down

0 comments on commit 5481c8c

Please sign in to comment.