Skip to content

Commit

Permalink
[PATCH] Changed 802.11 headers to use ieee80211_info_element[0]
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
James Ketrenos authored and Jeff Garzik committed Sep 16, 2005
1 parent 74079fd commit 68e4e03
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions include/net/ieee80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -538,30 +538,30 @@ struct ieee80211_authentication {
__le16 algorithm;
__le16 transaction;
__le16 status;
struct ieee80211_info_element info_element;
struct ieee80211_info_element info_element[0];
} __attribute__ ((packed));

struct ieee80211_probe_response {
struct ieee80211_hdr_3addr header;
u32 time_stamp[2];
__le16 beacon_interval;
__le16 capability;
struct ieee80211_info_element info_element;
struct ieee80211_info_element info_element[0];
} __attribute__ ((packed));

struct ieee80211_assoc_request_frame {
__le16 capability;
__le16 listen_interval;
u8 current_ap[ETH_ALEN];
struct ieee80211_info_element info_element;
struct ieee80211_info_element info_element[0];
} __attribute__ ((packed));

struct ieee80211_assoc_response_frame {
struct ieee80211_hdr_3addr header;
__le16 capability;
__le16 status;
__le16 aid;
struct ieee80211_info_element info_element; /* supported rates */
struct ieee80211_info_element info_element[0]; /* supported rates */
} __attribute__ ((packed));

struct ieee80211_txb {
Expand Down
4 changes: 2 additions & 2 deletions net/ieee80211/ieee80211_rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ static inline int ieee80211_network_init(struct ieee80211_device *ieee, struct i
network->wpa_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);
while (left >= sizeof(struct ieee80211_info_element_hdr)) {
if (sizeof(struct ieee80211_info_element_hdr) +
Expand Down Expand Up @@ -1050,7 +1050,7 @@ static inline void ieee80211_process_probe_response(struct ieee80211_device
struct ieee80211_network *target;
struct ieee80211_network *oldest = NULL;
#ifdef CONFIG_IEEE80211_DEBUG
struct ieee80211_info_element *info_element = &beacon->info_element;
struct ieee80211_info_element *info_element = beacon->info_element;
#endif
unsigned long flags;

Expand Down

0 comments on commit 68e4e03

Please sign in to comment.