summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2015-02-19 12:57:40 +0100
committerJohannes Berg <johannes.berg@intel.com>2015-02-24 21:12:07 +0100
commit17dce15801d5602719936045a7e84ff7dc6b6da2 (patch)
tree25778e5b0907de021fe614b75fb44549e1b43ff7 /net
parent81daf735f9fe35ef6bc4073068748b221d64fb47 (diff)
downloadlinux-17dce15801d5602719936045a7e84ff7dc6b6da2.tar.gz
linux-17dce15801d5602719936045a7e84ff7dc6b6da2.tar.bz2
linux-17dce15801d5602719936045a7e84ff7dc6b6da2.zip
mac80211/minstrel: fix !x!=0 confusion
Commit 06d961a8e210 ("mac80211/minstrel: use the new rate control API") inverted the condition 'if (msr->sample_limit != 0)' to 'if (!msr->sample_limit != 0)'. But it is confusing both to people and compilers (gcc5): net/mac80211/rc80211_minstrel.c: In function 'minstrel_get_rate': net/mac80211/rc80211_minstrel.c:376:26: warning: logical not is only applied to the left hand side of comparison if (!msr->sample_limit != 0) ^ Let there be only 'if (!msr->sample_limit)'. Fixes: 06d961a8e210 ("mac80211/minstrel: use the new rate control API") Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/rc80211_minstrel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c
index 7c86a002df95..ef6e8a6c4253 100644
--- a/net/mac80211/rc80211_minstrel.c
+++ b/net/mac80211/rc80211_minstrel.c
@@ -373,7 +373,7 @@ minstrel_get_rate(void *priv, struct ieee80211_sta *sta,
rate++;
mi->sample_deferred++;
} else {
- if (!msr->sample_limit != 0)
+ if (!msr->sample_limit)
return;
mi->sample_packets++;