summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2013-09-09 11:24:44 +0200
committerLuciano Coelho <luciano.coelho@intel.com>2013-10-23 08:47:45 +0200
commit8d3c1fd8c3a4a4a1a319491cdd09bd7eca23ba3b (patch)
tree0fe9deeafdea8151fcf9f0edf28b87ea392c2ea2 /drivers
parentwlcore: fix started_vifs calculation (diff)
downloadlinux-8d3c1fd8c3a4a4a1a319491cdd09bd7eca23ba3b.tar.xz
linux-8d3c1fd8c3a4a4a1a319491cdd09bd7eca23ba3b.zip
wlcore: save last regdom configuration on stop
In order to reconfigure the correct reg domain on recovery, we have to save the current configuration before clearing it (wl->reg_ch_conf_pending is considered before configuring a new regdomain). Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ti/wlcore/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index a9ee23417716..0368b9cbfb89 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -1949,8 +1949,10 @@ static void wlcore_op_stop_locked(struct wl1271 *wl)
/*
* FW channels must be re-calibrated after recovery,
- * clear the last Reg-Domain channel configuration.
+ * save current Reg-Domain channel configuration and clear it.
*/
+ memcpy(wl->reg_ch_conf_pending, wl->reg_ch_conf_last,
+ sizeof(wl->reg_ch_conf_pending));
memset(wl->reg_ch_conf_last, 0, sizeof(wl->reg_ch_conf_last));
}