From 4c1688c6eae33c8b6bc813c8dd709ac72073c0e8 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 13 Jul 2011 10:39:17 +0200
Subject: [PATCH] --- yaml --- r: 265364 b: refs/heads/master c:
 9090e167d08c4fd8d7d2c7c7b0126ab5881f219a h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/wireless/wl1251/cmd.h          | 2 +-
 trunk/drivers/net/wireless/wl1251/wl12xx_80211.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a9546fdc89ec..a03f328df545 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b40c04071ce3c0d74d19518ef884fed5c981fd7
+refs/heads/master: 9090e167d08c4fd8d7d2c7c7b0126ab5881f219a
diff --git a/trunk/drivers/net/wireless/wl1251/cmd.h b/trunk/drivers/net/wireless/wl1251/cmd.h
index 79ca5273c9e9..ee4f2b391822 100644
--- a/trunk/drivers/net/wireless/wl1251/cmd.h
+++ b/trunk/drivers/net/wireless/wl1251/cmd.h
@@ -269,7 +269,7 @@ struct cmd_join {
 	u8 bss_type;
 	u8 channel;
 	u8 ssid_len;
-	u8 ssid[IW_ESSID_MAX_SIZE];
+	u8 ssid[IEEE80211_MAX_SSID_LEN];
 	u8 ctrl; /* JOIN_CMD_CTRL_* */
 	u8 tx_mgt_frame_rate; /* OBSOLETE */
 	u8 tx_mgt_frame_mod;  /* OBSOLETE */
diff --git a/trunk/drivers/net/wireless/wl1251/wl12xx_80211.h b/trunk/drivers/net/wireless/wl1251/wl12xx_80211.h
index 1417b1445c3d..04ed51495772 100644
--- a/trunk/drivers/net/wireless/wl1251/wl12xx_80211.h
+++ b/trunk/drivers/net/wireless/wl1251/wl12xx_80211.h
@@ -76,7 +76,7 @@ struct wl12xx_ie_header {
 
 struct wl12xx_ie_ssid {
 	struct wl12xx_ie_header header;
-	char ssid[IW_ESSID_MAX_SIZE];
+	char ssid[IEEE80211_MAX_SSID_LEN];
 } __packed;
 
 struct wl12xx_ie_rates {