diff options
| author | Kalle Valo | 2017-11-02 18:48:25 +0100 |
|---|---|---|
| committer | Kalle Valo | 2017-11-02 18:48:25 +0100 |
| commit | e226fb5affccca98c405de80527180224d93d251 (patch) | |
| tree | a8a25b182db5058c874f6ca85383ad9f244afbac /drivers/net/wireless/ath/ath9k/link.c | |
| parent | rsi: fix kbuild reported build errors with CONFIG_PM off (diff) | |
| parent | ath: Convert timers to use timer_setup() (diff) | |
| download | kernel-qcow2-linux-e226fb5affccca98c405de80527180224d93d251.tar.gz kernel-qcow2-linux-e226fb5affccca98c405de80527180224d93d251.tar.xz kernel-qcow2-linux-e226fb5affccca98c405de80527180224d93d251.zip | |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for 4.15. Major changes:
wil6210
* remove ssid debugfs file
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/link.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/link.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/link.c b/drivers/net/wireless/ath/ath9k/link.c index 3f4f01c829f0..9d84003db800 100644 --- a/drivers/net/wireless/ath/ath9k/link.c +++ b/drivers/net/wireless/ath/ath9k/link.c @@ -301,11 +301,11 @@ fail_paprd: * When the task is complete, it reschedules itself depending on the * appropriate interval that was calculated. */ -void ath_ani_calibrate(unsigned long data) +void ath_ani_calibrate(struct timer_list *t) { - struct ath_softc *sc = (struct ath_softc *)data; + struct ath_common *common = from_timer(common, t, ani.timer); + struct ath_softc *sc = (struct ath_softc *)common->priv; struct ath_hw *ah = sc->sc_ah; - struct ath_common *common = ath9k_hw_common(ah); bool longcal = false; bool shortcal = false; bool aniflag = false; |