diff options
author | James Ketrenos <jketreno@linux.intel.com> | 2005-09-13 18:37:22 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-16 03:10:56 -0400 |
commit | 68e4e036b841d5fb23ae1ac51b1e40baf9d582bf (patch) | |
tree | a5fe3c6c7ef9fa132b5719790f7c1fc0084da083 /net/ieee80211/ieee80211_rx.c | |
parent | 74079fdce472a2b16d502fe39e06b135ef06c69b (diff) |
[PATCH] Changed 802.11 headers to use ieee80211_info_element[0]
Changed 802.11 headers to use ieee80211_info_element as zero sized
array so that sizeof calculations do not account for IE sizes.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'net/ieee80211/ieee80211_rx.c')
-rw-r--r-- | net/ieee80211/ieee80211_rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index 6bbaa44a0d03..cae55e5ccb2e 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c | |||
@@ -822,7 +822,7 @@ static inline int ieee80211_network_init(struct ieee80211_device *ieee, struct i | |||
822 | network->wpa_ie_len = 0; | 822 | network->wpa_ie_len = 0; |
823 | network->rsn_ie_len = 0; | 823 | network->rsn_ie_len = 0; |
824 | 824 | ||
825 | info_element = &beacon->info_element; | 825 | info_element = beacon->info_element; |
826 | left = stats->len - ((void *)info_element - (void *)beacon); | 826 | left = stats->len - ((void *)info_element - (void *)beacon); |
827 | while (left >= sizeof(struct ieee80211_info_element_hdr)) { | 827 | while (left >= sizeof(struct ieee80211_info_element_hdr)) { |
828 | if (sizeof(struct ieee80211_info_element_hdr) + | 828 | if (sizeof(struct ieee80211_info_element_hdr) + |
@@ -1050,7 +1050,7 @@ static inline void ieee80211_process_probe_response(struct ieee80211_device | |||
1050 | struct ieee80211_network *target; | 1050 | struct ieee80211_network *target; |
1051 | struct ieee80211_network *oldest = NULL; | 1051 | struct ieee80211_network *oldest = NULL; |
1052 | #ifdef CONFIG_IEEE80211_DEBUG | 1052 | #ifdef CONFIG_IEEE80211_DEBUG |
1053 | struct ieee80211_info_element *info_element = &beacon->info_element; | 1053 | struct ieee80211_info_element *info_element = beacon->info_element; |
1054 | #endif | 1054 | #endif |
1055 | unsigned long flags; | 1055 | unsigned long flags; |
1056 | 1056 | ||