1 files changed, 17 insertions, 1 deletions

diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c
index b8c171df6223..80ffe7412496 100644
--- a/drivers/net/wireless/mwifiex/sta_event.c
+++ b/drivers/net/wireless/mwifiex/sta_event.c
@@ -90,6 +90,10 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv, u16 reason_code)
         priv->is_data_rate_auto = true;
         priv->data_rate = 0;
 
+        if ((GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA ||
+             GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) && priv->hist_data)
+                mwifiex_hist_data_reset(priv);
+
         if (priv->bss_mode == NL80211_IFTYPE_ADHOC) {
                 priv->adhoc_state = ADHOC_IDLE;
                 priv->adhoc_is_link_sensed = false;
@@ -308,6 +312,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                                         adapter->ps_state = PS_STATE_AWAKE;
                                         adapter->pm_wakeup_card_req = false;
                                         adapter->pm_wakeup_fw_try = false;
+                                        del_timer_sync(&adapter->wakeup_timer);
                                         break;
                                 }
                                 if (!mwifiex_send_null_packet
@@ -322,6 +327,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                 adapter->ps_state = PS_STATE_AWAKE;
                 adapter->pm_wakeup_card_req = false;
                 adapter->pm_wakeup_fw_try = false;
+                del_timer_sync(&adapter->wakeup_timer);
 
                 break;
 
@@ -480,7 +486,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
 
         case EVENT_REMAIN_ON_CHAN_EXPIRED:
                 dev_dbg(adapter->dev, "event: Remain on channel expired\n");
-                cfg80211_remain_on_channel_expired(priv->wdev,
+                cfg80211_remain_on_channel_expired(&priv->wdev,
                                                    priv->roc_cfg.cookie,
                                                    &priv->roc_cfg.chan,
                                                    GFP_ATOMIC);
@@ -509,6 +515,16 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
                 mwifiex_parse_tx_status_event(priv, adapter->event_body);
                 break;
 
+        case EVENT_CHANNEL_REPORT_RDY:
+                dev_dbg(adapter->dev, "event: Channel Report\n");
+                ret = mwifiex_11h_handle_chanrpt_ready(priv,
+                                                       adapter->event_skb);
+                break;
+        case EVENT_RADAR_DETECTED:
+                dev_dbg(adapter->dev, "event: Radar detected\n");
+                ret = mwifiex_11h_handle_radar_detected(priv,
+                                                        adapter->event_skb);
+                break;
         default:
                 dev_dbg(adapter->dev, "event: unknown event id: %#x\n",
                         eventcause);