|
@@ -3260,9 +3260,8 @@ static void brcmf_init_escan(struct brcmf_cfg80211_info *cfg)
|
|
|
brcmf_cfg80211_escan_handler);
|
|
|
cfg->escan_info.escan_state = WL_ESCAN_STATE_IDLE;
|
|
|
/* Init scan_timeout timer */
|
|
|
- init_timer(&cfg->escan_timeout);
|
|
|
- cfg->escan_timeout.data = (unsigned long) cfg;
|
|
|
- cfg->escan_timeout.function = brcmf_escan_timeout;
|
|
|
+ setup_timer(&cfg->escan_timeout, brcmf_escan_timeout,
|
|
|
+ (unsigned long)cfg);
|
|
|
INIT_WORK(&cfg->escan_timeout_work,
|
|
|
brcmf_cfg80211_escan_timeout_worker);
|
|
|
}
|