diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-05 15:10:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-05 15:10:23 -0400 |
| commit | 90574ebb7e6e0f7f74636ee87315890ba88d6a4a (patch) | |
| tree | 5f60106dacbfe246f52aaaf9bac69dd4749f24a6 /drivers/net/wireless/ath/ath9k/ath9k.h | |
| parent | add79461a2a7d964a00b4a2fdaf313c4cf9cf4ec (diff) | |
| parent | ce5c1fe9a9e059b5c58f0a7e2a3e687d0efac815 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge this branch to pick up a fixlet and to update to a more recent base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ath9k.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index a277cf6f339d..4866550ddd96 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
| @@ -214,6 +214,7 @@ struct ath_frame_info { | |||
| 214 | enum ath9k_key_type keytype; | 214 | enum ath9k_key_type keytype; |
| 215 | u8 keyix; | 215 | u8 keyix; |
| 216 | u8 retries; | 216 | u8 retries; |
| 217 | u8 rtscts_rate; | ||
| 217 | }; | 218 | }; |
| 218 | 219 | ||
| 219 | struct ath_buf_state { | 220 | struct ath_buf_state { |