diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-01-19 15:58:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-19 15:58:41 -0500 |
| commit | 031cf0e94c9c8302a4592707939d6c2039f17f28 (patch) | |
| tree | 02f3f0d3f89f03217bdb83530af30a95c9ab6191 /net/mac80211/cfg.c | |
| parent | 730dd70549e0ec755dd55615ba5cfc38a482a947 (diff) | |
| parent | ad580db50ee8dccd069ffcd76d6f70fa6d4a62a8 (diff) | |
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, | |||
| 1389 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | 1389 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); |
| 1390 | struct ieee80211_conf *conf = &local->hw.conf; | 1390 | struct ieee80211_conf *conf = &local->hw.conf; |
| 1391 | 1391 | ||
| 1392 | if (sdata->vif.type != NL80211_IFTYPE_STATION) | ||
| 1393 | return -EOPNOTSUPP; | ||
| 1394 | |||
| 1392 | if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_PS)) | 1395 | if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_PS)) |
| 1393 | return -EOPNOTSUPP; | 1396 | return -EOPNOTSUPP; |
| 1394 | 1397 | ||