diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-04-29 12:48:14 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-05-06 13:45:53 -0400 |
commit | 8a98d49ec1f38d9f3eef7e34f148c3f1f5590fdf (patch) | |
tree | 5c4b2efe6a175f48f0bd1236a0f433616c57e8bc /drivers/net/wireless/iwlwifi/iwl-dev.h | |
parent | 46975f78fe1f480682e51c9acb03a5089b784cb6 (diff) |
iwlagn: remove frame pre-allocation
The frame pre-allocation is quite a bit of complex
code, all to avoid a single allocation. Remove it
and consolidate the beacon sending code.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 3d28ad258077..2fd752a9aac8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -238,15 +238,6 @@ struct iwl_channel_info { | |||
238 | #define IEEE80211_HLEN (IEEE80211_4ADDR_LEN) | 238 | #define IEEE80211_HLEN (IEEE80211_4ADDR_LEN) |
239 | #define IEEE80211_FRAME_LEN (IEEE80211_DATA_LEN + IEEE80211_HLEN) | 239 | #define IEEE80211_FRAME_LEN (IEEE80211_DATA_LEN + IEEE80211_HLEN) |
240 | 240 | ||
241 | struct iwl_frame { | ||
242 | union { | ||
243 | struct ieee80211_hdr frame; | ||
244 | struct iwl_tx_beacon_cmd beacon; | ||
245 | u8 raw[IEEE80211_FRAME_LEN]; | ||
246 | u8 cmd[360]; | ||
247 | } u; | ||
248 | struct list_head list; | ||
249 | }; | ||
250 | 241 | ||
251 | #define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4) | 242 | #define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4) |
252 | #define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ) | 243 | #define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ) |
@@ -1188,10 +1179,6 @@ struct iwl_priv { | |||
1188 | struct ieee80211_rate *ieee_rates; | 1179 | struct ieee80211_rate *ieee_rates; |
1189 | struct iwl_cfg *cfg; | 1180 | struct iwl_cfg *cfg; |
1190 | 1181 | ||
1191 | /* temporary frame storage list */ | ||
1192 | struct list_head free_frames; | ||
1193 | int frames_count; | ||
1194 | |||
1195 | enum ieee80211_band band; | 1182 | enum ieee80211_band band; |
1196 | 1183 | ||
1197 | void (*pre_rx_handler)(struct iwl_priv *priv, | 1184 | void (*pre_rx_handler)(struct iwl_priv *priv, |