[pkg-wpa-devel] r1224 - in /wpasupplicant/trunk: 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
kelmo-guest at users.alioth.debian.org
Thu Jul 17 12:27:19 UTC 2008
Author: kelmo-guest
Date: Thu Jul 17 12:27:19 2008
New Revision: 1224
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1224
Log:
Really commit upstream git up to 93ef879
Modified:
wpasupplicant/trunk/src/drivers/driver_nl80211.c
wpasupplicant/trunk/src/drivers/driver_wext.c
wpasupplicant/trunk/src/drivers/scan_helpers.c
wpasupplicant/trunk/wpa_supplicant/ctrl_iface_dbus_handlers.c
Modified: wpasupplicant/trunk/src/drivers/driver_nl80211.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/src/drivers/driver_nl80211.c?rev=1224&op=diff
==============================================================================
--- wpasupplicant/trunk/src/drivers/driver_nl80211.c (original)
+++ wpasupplicant/trunk/src/drivers/driver_nl80211.c Thu Jul 17 12:27:19 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/trunk/src/drivers/driver_wext.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/src/drivers/driver_wext.c?rev=1224&op=diff
==============================================================================
--- wpasupplicant/trunk/src/drivers/driver_wext.c (original)
+++ wpasupplicant/trunk/src/drivers/driver_wext.c Thu Jul 17 12:27:19 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/trunk/src/drivers/scan_helpers.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/src/drivers/scan_helpers.c?rev=1224&op=diff
==============================================================================
--- wpasupplicant/trunk/src/drivers/scan_helpers.c (original)
+++ wpasupplicant/trunk/src/drivers/scan_helpers.c Thu Jul 17 12:27:19 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/trunk/wpa_supplicant/ctrl_iface_dbus_handlers.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/ctrl_iface_dbus_handlers.c?rev=1224&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/ctrl_iface_dbus_handlers.c (original)
+++ wpasupplicant/trunk/wpa_supplicant/ctrl_iface_dbus_handlers.c Thu Jul 17 12:27:19 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))
More information about the Pkg-wpa-devel
mailing list