diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-01-19 21:58:41 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-19 21:58:41 +0100 |
| commit | 031cf0e94c9c8302a4592707939d6c2039f17f28 (patch) | |
| tree | 02f3f0d3f89f03217bdb83530af30a95c9ab6191 /net/mac80211/cfg.c | |
| parent | b43: N-PHY: drop unused definition, uncomment needed call (diff) | |
| parent | zd1211rw: adding 0409:0248 to supported device list (diff) | |
| download | linux-031cf0e94c9c8302a4592707939d6c2039f17f28.tar.xz linux-031cf0e94c9c8302a4592707939d6c2039f17f28.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index b0102c538b30..facf233843e0 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1389,6 +1389,9 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev, struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); struct ieee80211_conf *conf = &local->hw.conf; + if (sdata->vif.type != NL80211_IFTYPE_STATION) + return -EOPNOTSUPP; + if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_PS)) return -EOPNOTSUPP; |