diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-30 17:09:54 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-11-10 15:11:56 -0500 |
commit | 2c706002fc147decdba2658ea48e4436faca3af2 (patch) | |
tree | 3e515fa59e6f7de045579f103cba09cd05293de7 /drivers/net/wireless/libertas/dev.h | |
parent | 9b1fbae4b242cf86a878771eb59dc600dde72ec8 (diff) |
don't use net/ieee80211.h
Convert all the drivers using net/ieee80211.h to use linux/ieee80211.h.
Contains a bugfix in libertas where the SSID parsing could overrun the
buffer when the AP sends invalid information.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Dan Williams <dcbw@redhat.com> [airo, libertas]
Acked-by: Pavel Roskin <proski@gnu.org> [orinoco]
Acked-by: David Kilroy <kilroyd@googlemail.com> [orinoco]
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/dev.h')
-rw-r--r-- | drivers/net/wireless/libertas/dev.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h index f6f3753da303..dd682c4cfde8 100644 --- a/drivers/net/wireless/libertas/dev.h +++ b/drivers/net/wireless/libertas/dev.h | |||
@@ -10,7 +10,6 @@ | |||
10 | #include <linux/wireless.h> | 10 | #include <linux/wireless.h> |
11 | #include <linux/ethtool.h> | 11 | #include <linux/ethtool.h> |
12 | #include <linux/debugfs.h> | 12 | #include <linux/debugfs.h> |
13 | #include <net/ieee80211.h> | ||
14 | 13 | ||
15 | #include "defs.h" | 14 | #include "defs.h" |
16 | #include "hostcmd.h" | 15 | #include "hostcmd.h" |
@@ -278,6 +277,12 @@ struct lbs_private { | |||
278 | struct enc_key wpa_mcast_key; | 277 | struct enc_key wpa_mcast_key; |
279 | struct enc_key wpa_unicast_key; | 278 | struct enc_key wpa_unicast_key; |
280 | 279 | ||
280 | /* | ||
281 | * In theory, the IE is limited to the IE length, 255, | ||
282 | * but in practice 64 bytes are enough. | ||
283 | */ | ||
284 | #define MAX_WPA_IE_LEN 64 | ||
285 | |||
281 | /** WPA Information Elements*/ | 286 | /** WPA Information Elements*/ |
282 | u8 wpa_ie[MAX_WPA_IE_LEN]; | 287 | u8 wpa_ie[MAX_WPA_IE_LEN]; |
283 | u8 wpa_ie_len; | 288 | u8 wpa_ie_len; |