Commit fab4e763 authored by David S. Miller's avatar David S. Miller

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 5de3fcab
	("WAN: bit and/or confusion").
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a8fdf2b3
...@@ -667,7 +667,7 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv, ...@@ -667,7 +667,7 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv,
else if (!(skb->data[pkt_len] & FrameCrc)) else if (!(skb->data[pkt_len] & FrameCrc))
dev->stats.rx_crc_errors++; dev->stats.rx_crc_errors++;
else if ((skb->data[pkt_len] & (FrameVfr | FrameRab)) != else if ((skb->data[pkt_len] & (FrameVfr | FrameRab)) !=
FrameVfr | FrameRab) (FrameVfr | FrameRab))
dev->stats.rx_length_errors++; dev->stats.rx_length_errors++;
dev->stats.rx_errors++; dev->stats.rx_errors++;
dev_kfree_skb_irq(skb); dev_kfree_skb_irq(skb);
......
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