Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19a6d156 authored by Colin Ian King's avatar Colin Ian King Committed by David S. Miller
Browse files

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: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 14a03cf8

drivers/net/ethernet/cavium/liquidio/lio_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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;