iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] ieee80211 Removed ieee80211_info_element_hdr

Browse Source 
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>
This commit is contained in:
James Ketrenos 2005-09-13 17:38:13 -05:00 committed by Jeff Garzik
parent 68e4e036b8
commit 7b1fa54020
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/net/ieee80211.h
View File

@ -505,11 +505,6 @@ enum ieee80211_mfie {
MFIE_TYPE_GENERIC = 221, MFIE_TYPE_GENERIC = 221,
}; };
struct ieee80211_info_element_hdr {
u8 id;
u8 len;
} __attribute__ ((packed));
struct ieee80211_info_element { struct ieee80211_info_element {
u8 id; u8 id;
u8 len; u8 len;

10
net/ieee80211/ieee80211_rx.c
View File

@ -823,10 +823,10 @@ static inline int ieee80211_network_init(struct ieee80211_device *ieee, struct i
network->rsn_ie_len = 0; network->rsn_ie_len = 0;
info_element = beacon->info_element; info_element = beacon->info_element;
left = stats->len - ((void *)info_element - (void *)beacon); left = stats->len - sizeof(*beacon);
while (left >= sizeof(struct ieee80211_info_element_hdr)) { while (left >= sizeof(struct ieee80211_info_element)) {
if (sizeof(struct ieee80211_info_element_hdr) + if (sizeof(struct ieee80211_info_element) + info_element->len >
info_element->len > left) { left) {
IEEE80211_DEBUG_SCAN IEEE80211_DEBUG_SCAN
("SCAN: parse failed: info_element->len + 2 > left : info_element->len+2=%Zd left=%d.\n", ("SCAN: parse failed: info_element->len + 2 > left : info_element->len+2=%Zd left=%d.\n",
info_element->len + info_element->len +
@ -967,7 +967,7 @@ static inline int ieee80211_network_init(struct ieee80211_device *ieee, struct i
break; break;
} }
left -= sizeof(struct ieee80211_info_element_hdr) + left -= sizeof(struct ieee80211_info_element) +
info_element->len; info_element->len;
info_element = (struct ieee80211_info_element *) info_element = (struct ieee80211_info_element *)
&info_element->data[info_element->len]; &info_element->data[info_element->len];