[pkg-wpa-devel] r1221 - in /wpasupplicant/branches/upstream/current: src/drivers/driver_nl80211.c src/drivers/driver_wext.c src/drivers/scan_helpers.c wpa_supplicant/ctrl_iface_dbus_handlers.c

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Wed Jul 16 12:13:09 2008
New Revision: 1221

URL: http://svn.debian.org/wsvn/?sc=1&rev=1221
Log:
[svn-upgrade] Integrating new upstream version, wpasupplicant (0.6.4~git20080716.93ef879)

Modified:
    wpasupplicant/branches/upstream/current/src/drivers/driver_nl80211.c
    wpasupplicant/branches/upstream/current/src/drivers/driver_wext.c
    wpasupplicant/branches/upstream/current/src/drivers/scan_helpers.c
    wpasupplicant/branches/upstream/current/wpa_supplicant/ctrl_iface_dbus_handlers.c

Modified: wpasupplicant/branches/upstream/current/src/drivers/driver_nl80211.c
URL: http://svn.debian.org/wsvn/wpasupplicant/branches/upstream/current/src/drivers/driver_nl80211.c?rev=1221&op=diff
==============================================================================
--- wpasupplicant/branches/upstream/current/src/drivers/driver_nl80211.c (original)
+++ wpasupplicant/branches/upstream/current/src/drivers/driver_nl80211.c Wed Jul 16 12:13:09 2008
@@ -1237,7 +1237,11 @@
 		clen -= sizeof(struct iw_param);
 		custom += sizeof(struct iw_param);
 	}
-	res->maxrate = maxrate;
+
+	/* Convert the maxrate from WE-style (b/s units) to
+	 * 802.11 rates (500000 b/s units).
+	 */
+	res->maxrate = maxrate / 500000;
 }
 
 

Modified: wpasupplicant/branches/upstream/current/src/drivers/driver_wext.c
URL: http://svn.debian.org/wsvn/wpasupplicant/branches/upstream/current/src/drivers/driver_wext.c?rev=1221&op=diff
==============================================================================
--- wpasupplicant/branches/upstream/current/src/drivers/driver_wext.c (original)
+++ wpasupplicant/branches/upstream/current/src/drivers/driver_wext.c Wed Jul 16 12:13:09 2008
@@ -1364,7 +1364,11 @@
 		clen -= sizeof(struct iw_param);
 		custom += sizeof(struct iw_param);
 	}
-	res->maxrate = maxrate;
+
+	/* Convert the maxrate from WE-style (b/s units) to
+	 * 802.11 rates (500000 b/s units).
+	 */
+	res->maxrate = maxrate / 500000;
 }
 
 

Modified: wpasupplicant/branches/upstream/current/src/drivers/scan_helpers.c
URL: http://svn.debian.org/wsvn/wpasupplicant/branches/upstream/current/src/drivers/scan_helpers.c?rev=1221&op=diff
==============================================================================
--- wpasupplicant/branches/upstream/current/src/drivers/scan_helpers.c (original)
+++ wpasupplicant/branches/upstream/current/src/drivers/scan_helpers.c Wed Jul 16 12:13:09 2008
@@ -67,14 +67,14 @@
 
 	ie = wpa_scan_get_ie(res, WLAN_EID_SUPP_RATES);
 	for (i = 0; ie && i < ie[1]; i++) {
-		if (ie[i + 2] > rate)
-			rate = ie[i + 2];
+		if ((ie[i + 2] & 0x7f) > rate)
+			rate = ie[i + 2] & 0x7f;
 	}
 
 	ie = wpa_scan_get_ie(res, WLAN_EID_EXT_SUPP_RATES);
 	for (i = 0; ie && i < ie[1]; i++) {
-		if (ie[i + 2] > rate)
-			rate = ie[i + 2];
+		if ((ie[i + 2] & 0x7f) > rate)
+			rate = ie[i + 2] & 0x7f;
 	}
 
 	return rate;

Modified: wpasupplicant/branches/upstream/current/wpa_supplicant/ctrl_iface_dbus_handlers.c
URL: http://svn.debian.org/wsvn/wpasupplicant/branches/upstream/current/wpa_supplicant/ctrl_iface_dbus_handlers.c?rev=1221&op=diff
==============================================================================
--- wpasupplicant/branches/upstream/current/wpa_supplicant/ctrl_iface_dbus_handlers.c (original)
+++ wpasupplicant/branches/upstream/current/wpa_supplicant/ctrl_iface_dbus_handlers.c Wed Jul 16 12:13:09 2008
@@ -435,7 +435,7 @@
 	if (!wpa_dbus_dict_append_int32(&iter_dict, "level", res->level))
 		goto error;
 	if (!wpa_dbus_dict_append_int32(&iter_dict, "maxrate",
-					wpa_scan_get_max_rate(res)))
+					wpa_scan_get_max_rate(res) * 500000))
 		goto error;
 
 	if (!wpa_dbus_dict_close_write(&iter, &iter_dict))