mwl8k: add AP firmware handling to ->start()

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 19c6bea1bc48..1c4114f8d317 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -2713,12 +2713,17 @@ static int mwl8k_start(struct ieee80211_hw *hw)
         if (!rc) {
                 rc = mwl8k_cmd_802_11_radio_enable(hw);
 
-                if (!rc)
-                        rc = mwl8k_cmd_set_pre_scan(hw);
+                if (!priv->ap_fw) {
+                        if (!rc)
+                                rc = mwl8k_enable_sniffer(hw, 0);
 
-                if (!rc)
-                        rc = mwl8k_cmd_set_post_scan(hw,
-                                        "\x00\x00\x00\x00\x00\x00");
+                        if (!rc)
+                                rc = mwl8k_cmd_set_pre_scan(hw);
+
+                        if (!rc)
+                                rc = mwl8k_cmd_set_post_scan(hw,
+                                                "\x00\x00\x00\x00\x00\x00");
+                }
 
                 if (!rc)
                         rc = mwl8k_cmd_setrateadaptmode(hw, 0);
@@ -2726,9 +2731,6 @@ static int mwl8k_start(struct ieee80211_hw *hw)
                 if (!rc)
                         rc = mwl8k_set_wmm(hw, 0);
 
-                if (!rc)
-                        rc = mwl8k_enable_sniffer(hw, 0);
-
                 mwl8k_fw_unlock(hw);
         }