aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-05-28 21:20:22 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-05-28 21:20:22 +0000
commit6e5dd8c0b9a5c80e77a3ecf2ff217632c2abee3c (patch)
tree85a0fb02462f06a3160baf9dea954c0d92a88423
parent439fdd4d651fc168869b8166d7332449b520ac0c (diff)
downloadupstream-6e5dd8c0b9a5c80e77a3ecf2ff217632c2abee3c.tar.gz
upstream-6e5dd8c0b9a5c80e77a3ecf2ff217632c2abee3c.tar.bz2
upstream-6e5dd8c0b9a5c80e77a3ecf2ff217632c2abee3c.zip
mac80211: fix a crash issue introduced in the active monitor code
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36751
-rw-r--r--package/mac80211/patches/300-pending_work.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 33120a0903..c66693d237 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -3930,7 +3930,7 @@
change = true;
}
-+ if ((*flags & NL80211_MNTR_FLAG_ACTIVE) &&
++ if (flags && (*flags & NL80211_MNTR_FLAG_ACTIVE) &&
+ !(rdev->wiphy.features & NL80211_FEATURE_ACTIVE_MONITOR))
+ return -EOPNOTSUPP;
+