1 files changed, 25 insertions, 9 deletions

diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index de5b4fa5d166..7af1936719eb 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -992,7 +992,10 @@ static int wl18xx_boot(struct wl1271 *wl)
                 REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID |
                 INACTIVE_STA_EVENT_ID |
                 CHANNEL_SWITCH_COMPLETE_EVENT_ID |
-                DFS_CHANNELS_CONFIG_COMPLETE_EVENT;
+                DFS_CHANNELS_CONFIG_COMPLETE_EVENT |
+                SMART_CONFIG_SYNC_EVENT_ID |
+                SMART_CONFIG_DECODE_EVENT_ID;
+;
 
         wl->ap_event_mask = MAX_TX_FAILURE_EVENT_ID;
 
@@ -1606,15 +1609,20 @@ static bool wl18xx_lnk_high_prio(struct wl1271 *wl, u8 hlid,
         u8 thold;
         struct wl18xx_fw_status_priv *status_priv =
                 (struct wl18xx_fw_status_priv *)wl->fw_status->priv;
-        u32 suspend_bitmap = le32_to_cpu(status_priv->link_suspend_bitmap);
+        unsigned long suspend_bitmap;
+
+        /* if we don't have the link map yet, assume they all low prio */
+        if (!status_priv)
+                return false;
 
         /* suspended links are never high priority */
-        if (test_bit(hlid, (unsigned long *)&suspend_bitmap))
+        suspend_bitmap = le32_to_cpu(status_priv->link_suspend_bitmap);
+        if (test_bit(hlid, &suspend_bitmap))
                 return false;
 
         /* the priority thresholds are taken from FW */
-        if (test_bit(hlid, (unsigned long *)&wl->fw_fast_lnk_map) &&
-            !test_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map))
+        if (test_bit(hlid, &wl->fw_fast_lnk_map) &&
+            !test_bit(hlid, &wl->ap_fw_ps_map))
                 thold = status_priv->tx_fast_link_prio_threshold;
         else
                 thold = status_priv->tx_slow_link_prio_threshold;
@@ -1628,12 +1636,17 @@ static bool wl18xx_lnk_low_prio(struct wl1271 *wl, u8 hlid,
         u8 thold;
         struct wl18xx_fw_status_priv *status_priv =
                 (struct wl18xx_fw_status_priv *)wl->fw_status->priv;
-        u32 suspend_bitmap = le32_to_cpu(status_priv->link_suspend_bitmap);
+        unsigned long suspend_bitmap;
+
+        /* if we don't have the link map yet, assume they all low prio */
+        if (!status_priv)
+                return true;
 
-        if (test_bit(hlid, (unsigned long *)&suspend_bitmap))
+        suspend_bitmap = le32_to_cpu(status_priv->link_suspend_bitmap);
+        if (test_bit(hlid, &suspend_bitmap))
                 thold = status_priv->tx_suspend_threshold;
-        else if (test_bit(hlid, (unsigned long *)&wl->fw_fast_lnk_map) &&
-                 !test_bit(hlid, (unsigned long *)&wl->ap_fw_ps_map))
+        else if (test_bit(hlid, &wl->fw_fast_lnk_map) &&
+                 !test_bit(hlid, &wl->ap_fw_ps_map))
                 thold = status_priv->tx_fast_stop_threshold;
         else
                 thold = status_priv->tx_slow_stop_threshold;
@@ -1687,6 +1700,9 @@ static struct wlcore_ops wl18xx_ops = {
         .convert_hwaddr = wl18xx_convert_hwaddr,
         .lnk_high_prio  = wl18xx_lnk_high_prio,
         .lnk_low_prio   = wl18xx_lnk_low_prio,
+        .smart_config_start = wl18xx_cmd_smart_config_start,
+        .smart_config_stop  = wl18xx_cmd_smart_config_stop,
+        .smart_config_set_group_key = wl18xx_cmd_smart_config_set_group_key,
 };
 
 /* HT cap appropriate for wide channels in 2Ghz */