---

yaml --- r: 224248 b: refs/heads/master c: f5682c0 h: refs/heads/master v: v3
git-mirror · Nov 15, 2010 · 00aa032 · 00aa032
1 parent a65e85c
commit 00aa032
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4daaea656e0b5543c2e37c31934cea8f044b31e
+refs/heads/master: f5682c01eb85fce13d064d232c947322bd7e2631
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -1897,7 +1897,10 @@ static void iwlagn_bt_traffic_change_work(struct work_struct *work)
 
 	switch (priv->bt_traffic_load) {
 	case IWL_BT_COEX_TRAFFIC_LOAD_NONE:
-		smps_request = IEEE80211_SMPS_AUTOMATIC;
+		if (priv->bt_status)
+			smps_request = IEEE80211_SMPS_DYNAMIC;
+		else
+			smps_request = IEEE80211_SMPS_AUTOMATIC;
 		break;
 	case IWL_BT_COEX_TRAFFIC_LOAD_LOW:
 		smps_request = IEEE80211_SMPS_DYNAMIC;