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/htc.h | |
| 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/htc.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/htc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index 16dff4b89a86..9f64e32381f9 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h @@ -584,7 +584,7 @@ void ath9k_htc_tx_clear_slot(struct ath9k_htc_priv *priv, int slot); void ath9k_htc_tx_drain(struct ath9k_htc_priv *priv); void ath9k_htc_txstatus(struct ath9k_htc_priv *priv, void *wmi_event); void ath9k_tx_failed_tasklet(unsigned long data); -void ath9k_htc_tx_cleanup_timer(unsigned long data); +void ath9k_htc_tx_cleanup_timer(struct timer_list *t); bool ath9k_htc_csa_is_finished(struct ath9k_htc_priv *priv); int ath9k_rx_init(struct ath9k_htc_priv *priv); |