Prepare for hostapd/wpa_supplicant v2.0 release

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/hostapd/ChangeLog b/hostapd/ChangeLog
index db4ae6c209e8848d4075f67ecb338fb2f31bb8e6..6824e5a6e65d8a9d7a46b52d42e0771f54203702 100644 (file)
--- a/hostapd/ChangeLog
+++ b/hostapd/ChangeLog
@@ -1,6 +1,6 @@
 ChangeLog for hostapd
 
-????-??-?? - v2.0
+2013-01-12 - v2.0
        * added AP-STA-DISCONNECTED ctrl_iface event
        * improved debug logging (human readable event names, interface name
          included in more entries)
@@ -91,6 +91,9 @@ ChangeLog for hostapd
          remove active PBC indication from Probe Request frames properly
        * added support for using SQLite for the eap_user database
        * added Acct-Session-Id attribute into Access-Request messages
+       * fixed EAPOL frame transmission to non-QoS STAs with nl80211
+         (do not send QoS frames if the STA did not negotiate use of QoS for
+         this association)
 
 2012-05-10 - v1.0
        * Add channel selection support in hostapd. See hostapd.conf.

diff --git a/src/common/version.h b/src/common/version.h
index 7afba48d5d48fdef876a397c69b95e5bc417bd81..04ed0acb6238f386d60552de2d29606448ea7441 100644 (file)
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -5,6 +5,6 @@
 #define VERSION_STR_POSTFIX ""
 #endif /* VERSION_STR_POSTFIX */
 
-#define VERSION_STR "2.0-devel" VERSION_STR_POSTFIX
+#define VERSION_STR "2.0" VERSION_STR_POSTFIX
 
 #endif /* VERSION_H */

diff --git a/wpa_supplicant/ChangeLog b/wpa_supplicant/ChangeLog
index 98781c8b20370e39a28b65b541cc626993b0ac36..8abafb24d1262e4d940a29fc436d49967bdf2680 100644 (file)
--- a/wpa_supplicant/ChangeLog
+++ b/wpa_supplicant/ChangeLog
@@ -1,6 +1,6 @@
 ChangeLog for wpa_supplicant
 
-????-??-?? - v2.0
+2013-01-12 - v2.0
        * removed Qt3-based wpa_gui (obsoleted by wpa_qui-qt4)
        * removed unmaintained driver wrappers broadcom, iphone, osx, ralink,
          hostap, madwifi (hostap and madwifi remain available for hostapd;