diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-04 00:34:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-04 00:34:39 -0400 |
| commit | fab4e76373a614d3af624caedf18bee43fc6ca16 (patch) | |
| tree | 9f9fc4922a60e1018009e65e9f72e7e51fb67fe1 /drivers/net | |
| parent | a8fdf2b331b38d61fb5f11f3aec4a4f9fb2dedcb (diff) | |
WAN: dscc4: Fix warning pointing out a bug.
Noticed by Stephen Rothwell:
Today's linux-next build (x86_64 allmodconfig gcc-4.4.0)
produced this warning:
drivers/net/wan/dscc4.c: In function 'dscc4_rx_skb':
drivers/net/wan/dscc4.c:670: warning: suggest parentheses around comparison in operand of '|'
which actually points out a bug, I think. It is doing
(x & (y | z)) != y | z
when it probably means
(x & (y | z)) != (y | z)
Introduced by commit 5de3fcab91b0e1809eec030355d15801daf25083
("WAN: bit and/or confusion").
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wan/dscc4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index b2247bd0d492..81c8aec9df92 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c | |||
| @@ -667,7 +667,7 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv, | |||
| 667 | else if (!(skb->data[pkt_len] & FrameCrc)) | 667 | else if (!(skb->data[pkt_len] & FrameCrc)) |
| 668 | dev->stats.rx_crc_errors++; | 668 | dev->stats.rx_crc_errors++; |
| 669 | else if ((skb->data[pkt_len] & (FrameVfr | FrameRab)) != | 669 | else if ((skb->data[pkt_len] & (FrameVfr | FrameRab)) != |
| 670 | FrameVfr | FrameRab) | 670 | (FrameVfr | FrameRab)) |
| 671 | dev->stats.rx_length_errors++; | 671 | dev->stats.rx_length_errors++; |
| 672 | dev->stats.rx_errors++; | 672 | dev->stats.rx_errors++; |
| 673 | dev_kfree_skb_irq(skb); | 673 | dev_kfree_skb_irq(skb); |