diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-03-16 13:45:25 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-16 13:45:25 -0400 |
commit | 01a282980937f9ca55a3cb06b9c6ff1cc49ea396 (patch) | |
tree | 07a043edc861e245a7a9764751af0898a1f1199a /drivers/net/wireless/rt2x00/rt2800.h | |
parent | d5ddb4a59ed43b4c569b4efa8b508d50ef140cc6 (diff) | |
parent | 377526578f2c343ea281a918b18ece1fca65005c (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/ath/ath9k/hw.c
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800.h')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h index e5c05d8c744..063bfa8b91f 100644 --- a/drivers/net/wireless/rt2x00/rt2800.h +++ b/drivers/net/wireless/rt2x00/rt2800.h | |||
@@ -2475,6 +2475,12 @@ struct mac_iveiv_entry { | |||
2475 | #define EIRP_MAX_TX_POWER_LIMIT 0x50 | 2475 | #define EIRP_MAX_TX_POWER_LIMIT 0x50 |
2476 | 2476 | ||
2477 | /* | 2477 | /* |
2478 | * Number of TBTT intervals after which we have to adjust | ||
2479 | * the hw beacon timer. | ||
2480 | */ | ||
2481 | #define BCN_TBTT_OFFSET 64 | ||
2482 | |||
2483 | /* | ||
2478 | * RT2800 driver data structure | 2484 | * RT2800 driver data structure |
2479 | */ | 2485 | */ |
2480 | struct rt2800_drv_data { | 2486 | struct rt2800_drv_data { |
@@ -2484,6 +2490,7 @@ struct rt2800_drv_data { | |||
2484 | u8 bbp26; | 2490 | u8 bbp26; |
2485 | u8 txmixer_gain_24g; | 2491 | u8 txmixer_gain_24g; |
2486 | u8 txmixer_gain_5g; | 2492 | u8 txmixer_gain_5g; |
2493 | unsigned int tbtt_tick; | ||
2487 | }; | 2494 | }; |
2488 | 2495 | ||
2489 | #endif /* RT2800_H */ | 2496 | #endif /* RT2800_H */ |