diff options
| author | Joe Perches <joe@perches.com> | 2012-05-30 13:25:54 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-04 15:25:56 -0400 |
| commit | 5204267d2fd5e98fc52b44fec01ad10352642b78 (patch) | |
| tree | 316823693d721e2095fbedaf7498057c008307a0 /net | |
| parent | d8c7aae64cd2db5eccc631c29fa978a24fb1feef (diff) | |
| download | linux-stable-5204267d2fd5e98fc52b44fec01ad10352642b78.tar.gz linux-stable-5204267d2fd5e98fc52b44fec01ad10352642b78.tar.bz2 linux-stable-5204267d2fd5e98fc52b44fec01ad10352642b78.zip | |
mac80211: Fix likely misuse of | for &
Using | with a constant is always true.
Likely this should have be &.
cc: Ben Greear <greearb@candelatech.com>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | 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 495831ee48f1..e9cecca5c44d 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 { |