Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / mwifiex / uap_event.c

diff --git a/drivers/net/wireless/mwifiex/uap_event.c b/drivers/net/wireless/mwifiex/uap_event.c
index c54a537e31fbd2daa33da36e4d08a665778cf8be..96ff39722f8f8a3fb3d693064abe37a9fee8724b 100644 (file)
--- a/drivers/net/wireless/mwifiex/uap_event.c
+++ b/drivers/net/wireless/mwifiex/uap_event.c
@@ -68,7 +68,6 @@ int mwifiex_process_uap_event(struct mwifiex_private *priv)
                                len = ETH_ALEN;
 
                        if (len != -1) {
-                               sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
                                sinfo.assoc_req_ies = &event->data[len];
                                len = (u8 *)sinfo.assoc_req_ies -
                                      (u8 *)&event->frame_control;
@@ -132,6 +131,8 @@ int mwifiex_process_uap_event(struct mwifiex_private *priv)
                dev_dbg(adapter->dev, "AP EVENT: event id: %#x\n", eventcause);
                memcpy(priv->netdev->dev_addr, adapter->event_body + 2,
                       ETH_ALEN);
+               if (priv->hist_data)
+                       mwifiex_hist_data_reset(priv);
                break;
        case EVENT_UAP_MIC_COUNTERMEASURES:
                /* For future development */