Merge tag 'char-misc-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[karo-tx-linux.git] / drivers / net / wireless / hostap / hostap_80211_rx.c

diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c
index df7050abe717d9c09a6167ade588553a16041e79..d39e3e24077b1dca873f0ffe0dbce6a221dbaaea 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_80211_rx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_rx.c
@@ -415,7 +415,7 @@ static void hostap_rx_sta_beacon(local_info_t *local, struct sk_buff *skb,
                        ssid = pos + 2;
                        ssid_len = pos[1];
                        break;
-               case WLAN_EID_GENERIC:
+               case WLAN_EID_VENDOR_SPECIFIC:
                        if (pos[1] >= 4 &&
                            pos[2] == 0x00 && pos[3] == 0x50 &&
                            pos[4] == 0xf2 && pos[5] == 1) {