diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-02-02 03:05:22 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-02 03:05:22 -0500 |
commit | fb7899b1f0b748ef966071f5dc23c59ebd57d08f (patch) | |
tree | 2f13f9d8607871a60334608524e8b4e9447f5309 /net/mac80211/cfg.c | |
parent | 212b3c8b8ab94d983c2e0ee1821f17dd5b4e0859 (diff) | |
parent | abe94c756c08d50566c09a65b9c7fe72f83071c5 (diff) |
Merge commit 'v2.6.33-rc6' into secretlab/next-spi
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 6dc3579c0ac5..9ae1a4760b58 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
@@ -1331,6 +1331,9 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev, | |||
1331 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | 1331 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); |
1332 | struct ieee80211_conf *conf = &local->hw.conf; | 1332 | struct ieee80211_conf *conf = &local->hw.conf; |
1333 | 1333 | ||
1334 | if (sdata->vif.type != NL80211_IFTYPE_STATION) | ||
1335 | return -EOPNOTSUPP; | ||
1336 | |||
1334 | if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_PS)) | 1337 | if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_PS)) |
1335 | return -EOPNOTSUPP; | 1338 | return -EOPNOTSUPP; |
1336 | 1339 | ||