diff options
Diffstat (limited to 'drivers/net/wireless/wl12xx/tx.h')
-rw-r--r-- | drivers/net/wireless/wl12xx/tx.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/tx.h b/drivers/net/wireless/wl12xx/tx.h index 903e5dc69b7a..05722a560d91 100644 --- a/drivers/net/wireless/wl12xx/tx.h +++ b/drivers/net/wireless/wl12xx/tx.h | |||
@@ -29,6 +29,7 @@ | |||
29 | #define TX_HW_BLOCK_SIZE 252 | 29 | #define TX_HW_BLOCK_SIZE 252 |
30 | 30 | ||
31 | #define TX_HW_MGMT_PKT_LIFETIME_TU 2000 | 31 | #define TX_HW_MGMT_PKT_LIFETIME_TU 2000 |
32 | #define TX_HW_AP_MODE_PKT_LIFETIME_TU 8000 | ||
32 | /* The chipset reference driver states, that the "aid" value 1 | 33 | /* The chipset reference driver states, that the "aid" value 1 |
33 | * is for infra-BSS, but is still always used */ | 34 | * is for infra-BSS, but is still always used */ |
34 | #define TX_HW_DEFAULT_AID 1 | 35 | #define TX_HW_DEFAULT_AID 1 |
@@ -77,8 +78,12 @@ struct wl1271_tx_hw_descr { | |||
77 | u8 id; | 78 | u8 id; |
78 | /* The packet TID value (as User-Priority) */ | 79 | /* The packet TID value (as User-Priority) */ |
79 | u8 tid; | 80 | u8 tid; |
80 | /* Identifier of the remote STA in IBSS, 1 in infra-BSS */ | 81 | union { |
81 | u8 aid; | 82 | /* STA - Identifier of the remote STA in IBSS, 1 in infra-BSS */ |
83 | u8 aid; | ||
84 | /* AP - host link ID (HLID) */ | ||
85 | u8 hlid; | ||
86 | } __packed; | ||
82 | u8 reserved; | 87 | u8 reserved; |
83 | } __packed; | 88 | } __packed; |
84 | 89 | ||
@@ -146,5 +151,6 @@ void wl1271_tx_reset(struct wl1271 *wl); | |||
146 | void wl1271_tx_flush(struct wl1271 *wl); | 151 | void wl1271_tx_flush(struct wl1271 *wl); |
147 | u8 wl1271_rate_to_idx(int rate, enum ieee80211_band band); | 152 | u8 wl1271_rate_to_idx(int rate, enum ieee80211_band band); |
148 | u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set); | 153 | u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set); |
154 | u32 wl1271_tx_min_rate_get(struct wl1271 *wl); | ||
149 | 155 | ||
150 | #endif | 156 | #endif |