| .. | .. |
|---|
| 365 | 365 | if (!vif || !vif->csa_active) |
|---|
| 366 | 366 | return false; |
|---|
| 367 | 367 | |
|---|
| 368 | | - if (!ieee80211_csa_is_complete(vif)) |
|---|
| 368 | + if (!ieee80211_beacon_cntdwn_is_complete(vif)) |
|---|
| 369 | 369 | return false; |
|---|
| 370 | 370 | |
|---|
| 371 | 371 | ieee80211_csa_finish(vif); |
|---|
| .. | .. |
|---|
| 385 | 385 | ath9k_csa_update_vif, sc); |
|---|
| 386 | 386 | } |
|---|
| 387 | 387 | |
|---|
| 388 | | -void ath9k_beacon_tasklet(unsigned long data) |
|---|
| 388 | +void ath9k_beacon_tasklet(struct tasklet_struct *t) |
|---|
| 389 | 389 | { |
|---|
| 390 | | - struct ath_softc *sc = (struct ath_softc *)data; |
|---|
| 390 | + struct ath_softc *sc = from_tasklet(sc, t, bcon_tasklet); |
|---|
| 391 | 391 | struct ath_hw *ah = sc->sc_ah; |
|---|
| 392 | 392 | struct ath_common *common = ath9k_hw_common(ah); |
|---|
| 393 | 393 | struct ath_buf *bf = NULL; |
|---|