Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm

[~andy/linux] / drivers / net / wireless / wl12xx / boot.c

diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c
index d263ebb6f9742a3ffbe456f1bf5ce1a83a4a868c..b07f8b7e5f115eee23e640206c022851209ad3e0 100644 (file)
--- a/drivers/net/wireless/wl12xx/boot.c
+++ b/drivers/net/wireless/wl12xx/boot.c
@@ -479,11 +479,11 @@ static int wl1271_boot_run_firmware(struct wl1271 *wl)
                RSSI_SNR_TRIGGER_0_EVENT_ID |
                PSPOLL_DELIVERY_FAILURE_EVENT_ID |
                SOFT_GEMINI_SENSE_EVENT_ID |
-               MAX_TX_RETRY_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;
+               wl->event_mask |= STA_REMOVE_COMPLETE_EVENT_ID;
        else
                wl->event_mask |= DUMMY_PACKET_EVENT_ID;