Commit d8f8b954 authored by Niklas Cassel's avatar Niklas Cassel Committed by David S. Miller

net: stmmac: do not use a bitwise AND operator with a bool operand

Doing a bitwise AND between a bool and an int is generally not a good idea.
The bool will be promoted to an int with value 0 or 1,
the int is generally regarded as true with a non-zero value,
thus ANDing them has the potential to yield an undesired result.

This commit fixes the following smatch warnings:

drivers/net/ethernet/stmicro/stmmac/enh_desc.c:344 enh_desc_prepare_tx_desc() warn: maybe use && instead of &
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c:337 dwmac4_rd_prepare_tx_desc() warn: maybe use && instead of &
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c:380 dwmac4_rd_prepare_tso_tx_desc() warn: maybe use && instead of &
Signed-off-by: default avatarNiklas Cassel <niklas.cassel@axis.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 98fe9cd7
...@@ -334,7 +334,7 @@ static void dwmac4_rd_prepare_tx_desc(struct dma_desc *p, int is_fs, int len, ...@@ -334,7 +334,7 @@ static void dwmac4_rd_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
if (tx_own) if (tx_own)
tdes3 |= TDES3_OWN; tdes3 |= TDES3_OWN;
if (is_fs & tx_own) if (is_fs && tx_own)
/* When the own bit, for the first frame, has to be set, all /* When the own bit, for the first frame, has to be set, all
* descriptors for the same frame has to be set before, to * descriptors for the same frame has to be set before, to
* avoid race condition. * avoid race condition.
...@@ -377,7 +377,7 @@ static void dwmac4_rd_prepare_tso_tx_desc(struct dma_desc *p, int is_fs, ...@@ -377,7 +377,7 @@ static void dwmac4_rd_prepare_tso_tx_desc(struct dma_desc *p, int is_fs,
if (tx_own) if (tx_own)
tdes3 |= TDES3_OWN; tdes3 |= TDES3_OWN;
if (is_fs & tx_own) if (is_fs && tx_own)
/* When the own bit, for the first frame, has to be set, all /* When the own bit, for the first frame, has to be set, all
* descriptors for the same frame has to be set before, to * descriptors for the same frame has to be set before, to
* avoid race condition. * avoid race condition.
......
...@@ -341,7 +341,7 @@ static void enh_desc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len, ...@@ -341,7 +341,7 @@ static void enh_desc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
if (tx_own) if (tx_own)
tdes0 |= ETDES0_OWN; tdes0 |= ETDES0_OWN;
if (is_fs & tx_own) if (is_fs && tx_own)
/* When the own bit, for the first frame, has to be set, all /* When the own bit, for the first frame, has to be set, all
* descriptors for the same frame has to be set before, to * descriptors for the same frame has to be set before, to
* avoid race condition. * avoid race condition.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment