From f5ea7b96caf13fe0f3f3e6ce4a67b40f4e952a6d Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Wed, 30 May 2012 13:25:54 -0700
Subject: [PATCH] --- yaml --- r: 310730 b: refs/heads/master c:
 5204267d2fd5e98fc52b44fec01ad10352642b78 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/mac80211/cfg.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 575fd3648e2e..7cb761a6fa21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8c7aae64cd2db5eccc631c29fa978a24fb1feef
+refs/heads/master: 5204267d2fd5e98fc52b44fec01ad10352642b78
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index 495831ee48f1..e9cecca5c44d 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/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 {