summaryrefslogtreecommitdiff
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-06-28 15:45:58 +0400
committerJohannes Berg <johannes.berg@intel.com>2012-06-28 15:45:58 +0400
commitb1fbd46976d047a6d6767872a9112afaa914fd82 (patch)
tree59b471d8b38ca2a271fcde02f8f049e390ef485b /net/mac80211/cfg.c
parentbf0c111ec80355ee9fe2e2bdb609a536b54768d8 (diff)
parentbf52592fe4901f486a5266fd73e4ee80205b18b4 (diff)
downloadlinux-b1fbd46976d047a6d6767872a9112afaa914fd82.tar.xz
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index ebc353ef6902..0f02c8b77e1c 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2111,6 +2111,9 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy,
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
int i, ret;
+ if (!ieee80211_sdata_running(sdata))
+ return -ENETDOWN;
+
if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
ret = drv_set_bitrate_mask(local, sdata, mask);
if (ret)