From 812c25ab0038dfaf6a8da2e7006d0878014b52dd Mon Sep 17 00:00:00 2001
From: Benoit Papillault <benoit.papillault@free.fr>
Date: Fri, 15 Jan 2010 12:21:37 +0100
Subject: [PATCH] --- yaml --- r: 179793 b: refs/heads/master c:
 e5de30c9bf4a39db9f54c4a373470ce65881ade0 h: refs/heads/master i:   179791:
 870ce03c7162fa707384fdcb665545592566309e v: v3

---
 [refs]                   | 2 +-
 trunk/net/mac80211/cfg.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 744ab118bf3d..4f86ce349b4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f6120335c701ba07d5151206071f4d6ccaa684f
+refs/heads/master: e5de30c9bf4a39db9f54c4a373470ce65881ade0
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index 6dc3579c0ac5..9ae1a4760b58 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -1331,6 +1331,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;