commit 2683d65bb016a0533c25ead3025cbd24886cf35f
author Eliad Peller <eliad@wizery.com> Thu Jul 14 20:29:42 2011 +0300
committer John W. Linville <linville@tuxdriver.com> Mon Jul 18 14:29:03 2011 -0400
tree eb6f37fae2711030aeddc31c9482b36de85d0be0
parent b3c2ce131c7cd8c53b72b0cc04241cde17ce0c1d

mac80211: reconfigure tx on device reconfiguration

Add tx_conf array to save the current tx queues
configuration, and reconfig it on resume (ieee80211_reconfig).

On resume, the driver is being reconfigured. Without
reconfiguring the tx queues as well, the driver might
configure the device to use wrong ac params (e.g. ps-poll
instead of uapsd).

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

net/mac80211/mlme.c

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index c99237c..71e20a7 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -917,6 +917,7 @@
 			    params.aifs, params.cw_min, params.cw_max,
 			    params.txop, params.uapsd);
 #endif
+		local->tx_conf[queue] = params;
 		if (drv_conf_tx(local, queue, &params))
 			wiphy_debug(local->hw.wiphy,
 				    "failed to set TX queue parameters for queue %d\n",