diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-07-13 19:57:29 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-07-13 19:57:29 (GMT) |
commit | e300d955debdadf599c36e47eb0bc16f5976215c (patch) | |
tree | 8fafcc789dc06e90665e6eee6388af228bbd2fd7 /drivers/net/wireless/ath/ath9k/ath9k.h | |
parent | 242647bcf8464860f173f3d4d4ab3490d3558518 (diff) | |
parent | 815868e7b5c207ba42d5b317ccc51f8112732268 (diff) | |
download | linux-fsl-qoriq-e300d955debdadf599c36e47eb0bc16f5976215c.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/wl12xx/wl1271_cmd.h
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ath9k.h')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index 72d5e52..6e486a5 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h @@ -428,6 +428,7 @@ int ath_beaconq_config(struct ath_softc *sc); #define ATH_PAPRD_TIMEOUT 100 /* msecs */ +void ath_hw_check(struct work_struct *work); void ath_paprd_calibrate(struct work_struct *work); void ath_ani_calibrate(unsigned long data); @@ -562,6 +563,7 @@ struct ath_softc { spinlock_t sc_pm_lock; struct mutex mutex; struct work_struct paprd_work; + struct work_struct hw_check_work; struct completion paprd_complete; u32 intrstatus; |