summaryrefslogtreecommitdiffstats
path: root/net/ieee80211
diff options
context:
space:
mode:
authorJames Ketrenos <jketreno@linux.intel.com>2005-09-14 00:38:13 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-09-16 09:10:56 +0200
commit7b1fa54020985fa4b154f9f5d2f04ba174c7f1a5 (patch)
tree01bd894cfcca1a9bc70de6bf3163e379244ee46e /net/ieee80211
parent[PATCH] Changed 802.11 headers to use ieee80211_info_element[0] (diff)
downloadlinux-7b1fa54020985fa4b154f9f5d2f04ba174c7f1a5.tar.xz
linux-7b1fa54020985fa4b154f9f5d2f04ba174c7f1a5.zip
[PATCH] ieee80211 Removed ieee80211_info_element_hdr
Removed ieee80211_info_element_hdr structure as ieee80211_info_element provides the same use. Signed-off-by: James Ketrenos <jketreno@linux.intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'net/ieee80211')
-rw-r--r--net/ieee80211/ieee80211_rx.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index cae55e5ccb2e..e0337c8fcde8 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -823,10 +823,10 @@ static inline int ieee80211_network_init(struct ieee80211_device *ieee, struct i
network->rsn_ie_len = 0;
info_element = beacon->info_element;
- left = stats->len - ((void *)info_element - (void *)beacon);
- while (left >= sizeof(struct ieee80211_info_element_hdr)) {
- if (sizeof(struct ieee80211_info_element_hdr) +
- info_element->len > left) {
+ left = stats->len - sizeof(*beacon);
+ while (left >= sizeof(struct ieee80211_info_element)) {
+ if (sizeof(struct ieee80211_info_element) + info_element->len >
+ left) {
IEEE80211_DEBUG_SCAN
("SCAN: parse failed: info_element->len + 2 > left : info_element->len+2=%Zd left=%d.\n",
info_element->len +
@@ -967,7 +967,7 @@ static inline int ieee80211_network_init(struct ieee80211_device *ieee, struct i
break;
}
- left -= sizeof(struct ieee80211_info_element_hdr) +
+ left -= sizeof(struct ieee80211_info_element) +
info_element->len;
info_element = (struct ieee80211_info_element *)
&info_element->data[info_element->len];