1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c
index 41791ffd26ea..cc70422c0575 100644
--- a/drivers/net/wireless/wl12xx/boot.c
+++ b/drivers/net/wireless/wl12xx/boot.c
@@ -494,21 +494,18 @@ static int wl1271_boot_run_firmware(struct wl1271 *wl)
         wl->event_mask = BSS_LOSE_EVENT_ID |
                 SCAN_COMPLETE_EVENT_ID |
                 PS_REPORT_EVENT_ID |
-                JOIN_EVENT_COMPLETE_ID |
                 DISCONNECT_EVENT_COMPLETE_ID |
                 RSSI_SNR_TRIGGER_0_EVENT_ID |
                 PSPOLL_DELIVERY_FAILURE_EVENT_ID |
                 SOFT_GEMINI_SENSE_EVENT_ID |
                 PERIODIC_SCAN_REPORT_EVENT_ID |
-                PERIODIC_SCAN_COMPLETE_EVENT_ID;
-
-        if (wl->bss_type == BSS_TYPE_AP_BSS)
-                wl->event_mask |= STA_REMOVE_COMPLETE_EVENT_ID |
-                                  INACTIVE_STA_EVENT_ID |
-                                  MAX_TX_RETRY_EVENT_ID;
-        else
-                wl->event_mask |= DUMMY_PACKET_EVENT_ID |
-                        BA_SESSION_RX_CONSTRAINT_EVENT_ID;
+                PERIODIC_SCAN_COMPLETE_EVENT_ID |
+                DUMMY_PACKET_EVENT_ID |
+                PEER_REMOVE_COMPLETE_EVENT_ID |
+                BA_SESSION_RX_CONSTRAINT_EVENT_ID |
+                REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID |
+                INACTIVE_STA_EVENT_ID |
+                MAX_TX_RETRY_EVENT_ID;
 
         ret = wl1271_event_unmask(wl);
         if (ret < 0) {