mwifiex: remove struct ieee_types_erp_info

Commit Message

Bing Zhao Jan. 7, 2011, 4:59 a.m. UTC

None

Patch

diff --git a/drivers/net/wireless/mwifiex/ieee.h b/drivers/net/wireless/mwifiex/ieee.h
index 70af50c..2282c0c 100644
--- a/drivers/net/wireless/mwifiex/ieee.h
+++ b/drivers/net/wireless/mwifiex/ieee.h
@@ -93,12 +93,6 @@  union ieee_types_phy_param_set {
 	struct ieee_types_ds_param_set ds_param_set;
 } __packed;
 
-struct ieee_types_erp_info {
-	u8 element_id;
-	u8 len;
-	u8 erp_flags;
-} __packed;
-
 struct ieee_types_assoc_rsp {
 	__le16 cap_info_bitmap;
 	__le16 status_code;
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 104589e..83e466e 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1348,8 +1348,6 @@  mwifiex_interpret_bss_desc_with_ie(struct mwifiex_adapter *adapter,
 	u16 beacon_size;
 	u8 found_data_rate_ie;
 	u32 bytes_left_for_current_beacon;
-	struct ieee_types_erp_info *erp_info;
-
 	struct ieee_types_vendor_specific *vendor_ie;
 	const u8 wpa_oui[4] = { 0x00, 0x50, 0xf2, 0x01 };
 	const u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 };
@@ -1532,8 +1530,7 @@  mwifiex_interpret_bss_desc_with_ie(struct mwifiex_adapter *adapter,
 			break;
 
 		case WLAN_EID_ERP_INFO:
-			erp_info = (struct ieee_types_erp_info *) current_ptr;
-			bss_entry->erp_flags = erp_info->erp_flags;
+			bss_entry->erp_flags = *(current_ptr + 2);
 			break;
 
 		case WLAN_EID_EXT_SUPP_RATES: