Thread (5 messages) 5 messages, 3 authors, 2012-05-30

Re: [PATCH 1/4] mac80211: Fix likely misuse of | for &

From: Ben Greear <hidden>
Date: 2012-05-30 20:29:57
Also in: lkml, netdev

On 05/30/2012 01:25 PM, Joe Perches wrote:
Using | with a constant is always true.
Likely this should have be&.
Yes, I think your change is correct.  Looks like something
a compiler or static analysis tool could catch and warn about...

Sorry for the bug!

Ben
quoted hunk ↗ jump to hunk
cc: Ben Greear<redacted>
Signed-off-by: Joe Perches<joe@perches.com>
---
  net/mac80211/cfg.c |    6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 495831e..e9cecca 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -533,16 +533,16 @@ static void ieee80211_get_et_stats(struct wiphy *wiphy,
  		sinfo.filled = 0;
  		sta_set_sinfo(sta,&sinfo);

-		if (sinfo.filled | STATION_INFO_TX_BITRATE)
+		if (sinfo.filled&  STATION_INFO_TX_BITRATE)
  			data[i] = 100000 *
  				cfg80211_calculate_bitrate(&sinfo.txrate);
  		i++;
-		if (sinfo.filled | STATION_INFO_RX_BITRATE)
+		if (sinfo.filled&  STATION_INFO_RX_BITRATE)
  			data[i] = 100000 *
  				cfg80211_calculate_bitrate(&sinfo.rxrate);
  		i++;

-		if (sinfo.filled | STATION_INFO_SIGNAL_AVG)
+		if (sinfo.filled&  STATION_INFO_SIGNAL_AVG)
  			data[i] = (u8)sinfo.signal_avg;
  		i++;
  	} else {

-- 
Ben Greear [off-list ref]
Candela Technologies Inc  http://www.candelatech.com
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help