From 44b7065774d469258107c15036b50cbe6456894c Mon Sep 17 00:00:00 2001
From: Yogesh Ashok Powar <yogeshp@marvell.com>
Date: Mon, 29 Aug 2011 17:12:44 +0530
Subject: [PATCH] --- yaml --- r: 265967 b: refs/heads/master c:
 2a36a0ec1550ffb4d608134e2504a6a67d1d1740 h: refs/heads/master i:   265965:
 d17aac8408dfd3d783cf6b324d451d7fd796c060   265963:
 77fec1260618ec2c21c47091de1806ef4df85e24   265959:
 3e36aeab7e5cb4ef6daf92547e735251a1ccba54   265951:
 7b8f9529d320fdb736d11438c81a7ad18e86bf7e v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/wireless/mwl8k.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d46268d2de1b..5acc594c8728 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c42e6ef28d89fc2157d4d65869471f607fcf64e
+refs/heads/master: 2a36a0ec1550ffb4d608134e2504a6a67d1d1740
diff --git a/trunk/drivers/net/wireless/mwl8k.c b/trunk/drivers/net/wireless/mwl8k.c
index 771280a47ea7..ea1395aafa39 100644
--- a/trunk/drivers/net/wireless/mwl8k.c
+++ b/trunk/drivers/net/wireless/mwl8k.c
@@ -5501,6 +5501,14 @@ static int mwl8k_firmware_load_success(struct mwl8k_priv *priv)
 
 	/* Set rssi values to dBm */
 	hw->flags |= IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_HAS_RATE_CONTROL;
+
+	/*
+	 * Ask mac80211 to not to trigger PS mode
+	 * based on PM bit of incoming frames.
+	 */
+	if (priv->ap_fw)
+		hw->flags |= IEEE80211_HW_AP_LINK_PS;
+
 	hw->vif_data_size = sizeof(struct mwl8k_vif);
 	hw->sta_data_size = sizeof(struct mwl8k_sta);