Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc

[pandora-kernel.git] / drivers / net / wireless / wl1251 / cmd.h

diff --git a/drivers/net/wireless/wl1251/cmd.h b/drivers/net/wireless/wl1251/cmd.h
index 79ca527..ee4f2b3 100644 (file)
--- a/drivers/net/wireless/wl1251/cmd.h
+++ b/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 */