diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-10-11 15:35:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-11 15:35:42 -0400 |
| commit | 094daf7db7c47861009899ce23f9177d761e20b0 (patch) | |
| tree | a107065393720b80664157a035b206576e834793 /drivers/net/wireless/ath/ath9k/ath9k.h | |
| parent | 3ed6f6958c0ac21958285d8648f14d34da4bbcb3 (diff) | |
| parent | 5f68a2b0a890d086e40fc7b55f4a0c32c28bc0d2 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Conflicts:
Documentation/feature-removal-schedule.txt
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ath9k.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index 94d887b65e69..1e8614783181 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
| @@ -340,7 +340,8 @@ void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid); | |||
| 340 | void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid); | 340 | void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid); |
| 341 | 341 | ||
| 342 | void ath_tx_aggr_wakeup(struct ath_softc *sc, struct ath_node *an); | 342 | void ath_tx_aggr_wakeup(struct ath_softc *sc, struct ath_node *an); |
| 343 | bool ath_tx_aggr_sleep(struct ath_softc *sc, struct ath_node *an); | 343 | void ath_tx_aggr_sleep(struct ieee80211_sta *sta, struct ath_softc *sc, |
| 344 | struct ath_node *an); | ||
| 344 | 345 | ||
| 345 | /********/ | 346 | /********/ |
| 346 | /* VIFs */ | 347 | /* VIFs */ |