diff options
| author | Takahiro Shimizu <tshimizu818@gmail.com> | 2012-04-20 18:50:29 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-21 15:27:45 -0400 |
| commit | 5481c8cd83b4cb0f9f0746e1f477ac231e7eedb6 (patch) | |
| tree | 887b5d0955084428aa186c501e40043af96d3c29 /drivers/net | |
| parent | d50566c7274376f5d9325d675d4854d27798018f (diff) | |
| download | talos-obmc-linux-5481c8cd83b4cb0f9f0746e1f477ac231e7eedb6.tar.gz talos-obmc-linux-5481c8cd83b4cb0f9f0746e1f477ac231e7eedb6.zip | |
pch_gbe: simplify transmit time stamping flag test
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index 7c2dabb8cefc..6a9a63bcb408 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -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; |
