summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvraham Stern <avraham.stern@intel.com>2017-06-12 10:44:58 +0300
committerJohannes Berg <johannes.berg@intel.com>2017-06-13 10:24:32 +0200
commit204a7dbcb27bc4b461f42d7f96fdc875eb677f2f (patch)
tree7e39bdd064161cfa8d7ef0bd1304d0da1d61b05e
parent769dc04db3ed8484798aceb015b94deacc2ba557 (diff)
downloadlinux-stable-204a7dbcb27bc4b461f42d7f96fdc875eb677f2f.tar.gz
linux-stable-204a7dbcb27bc4b461f42d7f96fdc875eb677f2f.tar.bz2
linux-stable-204a7dbcb27bc4b461f42d7f96fdc875eb677f2f.zip
mac80211: Fix incorrect condition when checking rx timestamp
If the driver reports the rx timestamp at PLCP start, mac80211 can only handle legacy encoding, but the code checks that the encoding is not legacy. Fix this. Fixes: da6a4352e7c8 ("mac80211: separate encoding/bandwidth from flags") Signed-off-by: Avraham Stern <avraham.stern@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/mac80211/ieee80211_i.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 665501ac358f..5e002f62c235 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1531,7 +1531,7 @@ ieee80211_have_rx_timestamp(struct ieee80211_rx_status *status)
return true;
/* can't handle non-legacy preamble yet */
if (status->flag & RX_FLAG_MACTIME_PLCP_START &&
- status->encoding != RX_ENC_LEGACY)
+ status->encoding == RX_ENC_LEGACY)
return true;
return false;
}