From df478160c6fa07e7fe7535a522d5719b4591424c Mon Sep 17 00:00:00 2001
From: Arik Nemtsov <arik@wizery.com>
Date: Tue, 22 Mar 2011 10:07:47 +0200
Subject: [PATCH] --- yaml --- r: 247110 b: refs/heads/master c:
 17e672d6e4b5a8a3f330a70dfd58d25a2cb497b5 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/wireless/wl12xx/main.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b7e56d25106f..87124fcc933b 100644
--- 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
index 9663326c0dfa..5545c3b94d2e 100644
--- 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;
 	}