]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
net: cavium: liquidio: fix check for in progress flag
authorColin Ian King <colin.king@canonical.com>
Fri, 5 Feb 2016 16:30:39 +0000 (16:30 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 13 Feb 2016 11:05:41 +0000 (06:05 -0500)
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>
drivers/net/ethernet/cavium/liquidio/lio_main.c

index ac0394c9e8abaf653200e40ebe9b9169b0ba6cff..34d269cd5579b7e0f1c1afd29bffb04c8711d71d 100644 (file)
@@ -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;