summaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-06-13 15:35:35 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-06-13 15:35:35 -0400
commit211c17aaee644bb808fbdeef547ac99db92c01ed (patch)
tree2acf7fe32b30f537b06fed7e4c536ef0d11f2902 /net/mac80211/cfg.c
parentec8eb9ae5819da011ac574aa290207a2a47cdbae (diff)
parentbcb7ad7bcbef030e6ba71ede1f9866368aca7c99 (diff)
downloadlinux-211c17aaee644bb808fbdeef547ac99db92c01ed.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts: drivers/net/wireless/ath/ath9k/main.c net/bluetooth/hci_event.c
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 498c94e34427..85ac364f4636 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2097,6 +2097,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)