|
@@ -2722,13 +2722,11 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)
|
|
|
ieee->enable_rx_imm_BA = 1;
|
|
|
ieee->tx_pending.txb = NULL;
|
|
|
|
|
|
- init_timer(&ieee->associate_timer);
|
|
|
- ieee->associate_timer.data = (unsigned long)ieee;
|
|
|
- ieee->associate_timer.function = ieee80211_associate_abort_cb;
|
|
|
+ setup_timer(&ieee->associate_timer, ieee80211_associate_abort_cb,
|
|
|
+ (unsigned long)ieee);
|
|
|
|
|
|
- init_timer(&ieee->beacon_timer);
|
|
|
- ieee->beacon_timer.data = (unsigned long) ieee;
|
|
|
- ieee->beacon_timer.function = ieee80211_send_beacon_cb;
|
|
|
+ setup_timer(&ieee->beacon_timer, ieee80211_send_beacon_cb,
|
|
|
+ (unsigned long)ieee);
|
|
|
|
|
|
ieee->wq = create_workqueue(DRV_NAME);
|
|
|
|