summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/libertas/scan.h
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2007-05-11 06:51:28 +0400
committerJohn W. Linville <linville@tuxdriver.com>2007-05-11 22:54:52 +0400
commit51b0c9d09d0a889a232605e71555e390b3b110fb (patch)
tree204f0d5eab138d5af6f0e044261220a361ed851a /drivers/net/wireless/libertas/scan.h
parent1f8a6b658a943b4f04a1fc7b3a420360202c86cd (diff)
downloadlinux-51b0c9d09d0a889a232605e71555e390b3b110fb.tar.xz
[PATCH] libertas: remove WPA_SUPPLICANT structure
Start to normalize bss_descriptor with ieee80211_network so we can eventually replace bss_descriptor more easily. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/scan.h')
-rw-r--r--drivers/net/wireless/libertas/scan.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/scan.h b/drivers/net/wireless/libertas/scan.h
index d93aa7fa44fd..1a8756edfeb5 100644
--- a/drivers/net/wireless/libertas/scan.h
+++ b/drivers/net/wireless/libertas/scan.h
@@ -10,6 +10,7 @@
#ifndef _WLAN_SCAN_H
#define _WLAN_SCAN_H
+#include <net/ieee80211.h>
#include "hostcmd.h"
/**
@@ -170,9 +171,10 @@ struct bss_descriptor {
struct ieeetypes_countryinfofullset countryinfo;
- struct WPA_SUPPLICANT wpa_supplicant;
- struct WPA_SUPPLICANT wpa2_supplicant;
-
+ u8 wpa_ie[MAX_WPA_IE_LEN];
+ size_t wpa_ie_len;
+ u8 rsn_ie[MAX_WPA_IE_LEN];
+ size_t rsn_ie_len;
};
extern int libertas_SSID_cmp(struct WLAN_802_11_SSID *ssid1,