aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211
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
commit0a860b5f30c01c7f5970b22ae892610b9b5bb978 (patch)
tree8d109065525ba3ee5517e48d808be35569c141af /package/mac80211
parentc802b55757649549619fbf3011ee56feaa60a1f9 (diff)
downloadupstream-0a860b5f30c01c7f5970b22ae892610b9b5bb978.tar.gz
upstream-0a860b5f30c01c7f5970b22ae892610b9b5bb978.tar.bz2
upstream-0a860b5f30c01c7f5970b22ae892610b9b5bb978.zip
mac80211: fix a crash issue introduced in the active monitor code
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36751 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211')
-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;
+