1 files changed, 22 insertions, 15 deletions

diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index 8e562610bf16..717c4f5a02c2 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -378,6 +378,7 @@ static struct wlcore_conf wl18xx_conf = {
                 .keep_alive_interval         = 55000,
                 .max_listen_interval         = 20,
                 .sta_sleep_auth              = WL1271_PSM_ILLEGAL,
+                .suspend_rx_ba_activity      = 0,
         },
         .itrim = {
                 .enable = false,
@@ -567,6 +568,12 @@ static struct wl18xx_priv_conf wl18xx_default_priv_conf = {
                 .high_power_val_2nd             = 0xff,
                 .tx_rf_margin                   = 1,
         },
+        .ap_sleep = {               /* disabled by default */
+                .idle_duty_cycle        = 0,
+                .connected_duty_cycle   = 0,
+                .max_stations_thresh    = 0,
+                .idle_conn_thresh       = 0,
+        },
 };
 
 static const struct wlcore_partition_set wl18xx_ptable[PART_TABLE_LEN] = {
@@ -648,7 +655,7 @@ static const struct wl18xx_clk_cfg wl18xx_clk_table[NUM_CLOCK_CONFIGS] = {
 };
 
 /* TODO: maybe move to a new header file? */
-#define WL18XX_FW_NAME "ti-connectivity/wl18xx-fw-3.bin"
+#define WL18XX_FW_NAME "ti-connectivity/wl18xx-fw-4.bin"
 
 static int wl18xx_identify_chip(struct wl1271 *wl)
 {
@@ -983,6 +990,7 @@ static int wl18xx_boot(struct wl1271 *wl)
 
         wl->event_mask = BSS_LOSS_EVENT_ID |
                 SCAN_COMPLETE_EVENT_ID |
+                RADAR_DETECTED_EVENT_ID |
                 RSSI_SNR_TRIGGER_0_EVENT_ID |
                 PERIODIC_SCAN_COMPLETE_EVENT_ID |
                 PERIODIC_SCAN_REPORT_EVENT_ID |
@@ -1559,26 +1567,19 @@ static u32 wl18xx_pre_pkt_send(struct wl1271 *wl,
 }
 
 static void wl18xx_sta_rc_update(struct wl1271 *wl,
-                                 struct wl12xx_vif *wlvif,
-                                 struct ieee80211_sta *sta,
-                                 u32 changed)
+                                 struct wl12xx_vif *wlvif)
 {
-        bool wide = sta->bandwidth >= IEEE80211_STA_RX_BW_40;
+        bool wide = wlvif->rc_update_bw >= IEEE80211_STA_RX_BW_40;
 
         wl1271_debug(DEBUG_MAC80211, "mac80211 sta_rc_update wide %d", wide);
 
-        if (!(changed & IEEE80211_RC_BW_CHANGED))
-                return;
-
-        mutex_lock(&wl->mutex);
-
         /* sanity */
         if (WARN_ON(wlvif->bss_type != BSS_TYPE_STA_BSS))
-                goto out;
+                return;
 
         /* ignore the change before association */
         if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
-                goto out;
+                return;
 
         /*
          * If we started out as wide, we can change the operation mode. If we
@@ -1589,9 +1590,6 @@ static void wl18xx_sta_rc_update(struct wl1271 *wl,
                 wl18xx_acx_peer_ht_operation_mode(wl, wlvif->sta.hlid, wide);
         else
                 ieee80211_connection_loss(wl12xx_wlvif_to_vif(wlvif));
-
-out:
-        mutex_unlock(&wl->mutex);
 }
 
 static int wl18xx_set_peer_cap(struct wl1271 *wl,
@@ -1703,6 +1701,11 @@ static struct wlcore_ops wl18xx_ops = {
         .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,
+        .interrupt_notify = wl18xx_acx_interrupt_notify_config,
+        .rx_ba_filter   = wl18xx_acx_rx_ba_filter,
+        .ap_sleep       = wl18xx_acx_ap_sleep,
+        .set_cac        = wl18xx_cmd_set_cac,
+        .dfs_master_restart     = wl18xx_cmd_dfs_master_restart,
 };
 
 /* HT cap appropriate for wide channels in 2Ghz */
@@ -1796,6 +1799,10 @@ wl18xx_iface_combinations[] = {
                 .limits = wl18xx_iface_ap_limits,
                 .n_limits = ARRAY_SIZE(wl18xx_iface_ap_limits),
                 .num_different_channels = 1,
+                .radar_detect_widths =  BIT(NL80211_CHAN_NO_HT) |
+                                        BIT(NL80211_CHAN_HT20) |
+                                        BIT(NL80211_CHAN_HT40MINUS) |
+                                        BIT(NL80211_CHAN_HT40PLUS),
         }
 };