diff options
| author | Colin Ian King | 2016-02-05 17:30:39 +0100 |
|---|---|---|
| committer | David S. Miller | 2016-02-13 12:05:41 +0100 |
| commit | 19a6d156a7bd080f3a855a40a4a08ab475e34b4a (patch) | |
| tree | b23da02c6fb0f0157f0d632adeff4eed06672e2e /drivers/net/ethernet/cavium | |
| parent | hv_netvsc: Restore needed_headroom request (diff) | |
| download | kernel-qcow2-linux-19a6d156a7bd080f3a855a40a4a08ab475e34b4a.tar.gz kernel-qcow2-linux-19a6d156a7bd080f3a855a40a4a08ab475e34b4a.tar.xz kernel-qcow2-linux-19a6d156a7bd080f3a855a40a4a08ab475e34b4a.zip | |
net: cavium: liquidio: fix check for in progress flag
smatch detected a suspicious looking bitop condition:
drivers/net/ethernet/cavium/liquidio/lio_main.c:2529
handle_timestamp() warn: suspicious bitop condition
(skb_shinfo(skb)->tx_flags | SKBTX_IN_PROGRESS is always non-zero,
so the logic is definitely not correct. Use & to mask the correct
bit.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium')
| -rw-r--r-- | drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index ac0394c9e8ab..34d269cd5579 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -2524,7 +2524,7 @@ static void handle_timestamp(struct octeon_device *oct, octeon_swap_8B_data(&resp->timestamp, 1); - if (unlikely((skb_shinfo(skb)->tx_flags | SKBTX_IN_PROGRESS) != 0)) { + if (unlikely((skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS) != 0)) { struct skb_shared_hwtstamps ts; u64 ns = resp->timestamp; |