---

yaml --- r: 247110 b: refs/heads/master c: 17e672d h: refs/heads/master v: v3
git-mirror · Apr 19, 2011 · df47816 · df47816
1 parent 5a9d591
commit df47816
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a31c11c7d8c482598754a577a8fb71abb61ffa0
+refs/heads/master: 17e672d6e4b5a8a3f330a70dfd58d25a2cb497b5
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -1706,7 +1706,12 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
 	mutex_lock(&wl->mutex);
 
 	if (unlikely(wl->state == WL1271_STATE_OFF)) {
-		ret = -EAGAIN;
+		/* we support configuring the channel and band while off */
+		if ((changed & IEEE80211_CONF_CHANGE_CHANNEL)) {
+			wl->band = conf->channel->band;
+			wl->channel = channel;
+		}
+
 		goto out;
 	}