projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GAS: Report GAS-QUERY-DONE event on initial req TX failure
[mech_eap.git]
/
wpa_supplicant
/
wpa_supplicant.c
diff --git
a/wpa_supplicant/wpa_supplicant.c
b/wpa_supplicant/wpa_supplicant.c
index
d3848cb
..
6999bbb
100644
(file)
--- a/
wpa_supplicant/wpa_supplicant.c
+++ b/
wpa_supplicant/wpa_supplicant.c
@@
-3806,8
+3806,8
@@
void wpa_supplicant_apply_vht_overrides(
if (!vhtcaps || !vhtcaps_mask)
return;
if (!vhtcaps || !vhtcaps_mask)
return;
- vhtcaps->vht_capabilities_info =
ssid->vht_capa
;
- vhtcaps_mask->vht_capabilities_info =
ssid->vht_capa_mask
;
+ vhtcaps->vht_capabilities_info =
host_to_le32(ssid->vht_capa)
;
+ vhtcaps_mask->vht_capabilities_info =
host_to_le32(ssid->vht_capa_mask)
;
#ifdef CONFIG_HT_OVERRIDES
/* if max ampdu is <= 3, we have to make the HT cap the same */
#ifdef CONFIG_HT_OVERRIDES
/* if max ampdu is <= 3, we have to make the HT cap the same */
@@
-3829,15
+3829,17
@@
void wpa_supplicant_apply_vht_overrides(
#define OVERRIDE_MCS(i) \
if (ssid->vht_tx_mcs_nss_ ##i >= 0) { \
vhtcaps_mask->vht_supported_mcs_set.tx_map |= \
#define OVERRIDE_MCS(i) \
if (ssid->vht_tx_mcs_nss_ ##i >= 0) { \
vhtcaps_mask->vht_supported_mcs_set.tx_map |= \
-
3 << 2 * (i - 1);
\
+
host_to_le16(3 << 2 * (i - 1));
\
vhtcaps->vht_supported_mcs_set.tx_map |= \
vhtcaps->vht_supported_mcs_set.tx_map |= \
- ssid->vht_tx_mcs_nss_ ##i << 2 * (i - 1); \
+ host_to_le16(ssid->vht_tx_mcs_nss_ ##i << \
+ 2 * (i - 1)); \
} \
if (ssid->vht_rx_mcs_nss_ ##i >= 0) { \
vhtcaps_mask->vht_supported_mcs_set.rx_map |= \
} \
if (ssid->vht_rx_mcs_nss_ ##i >= 0) { \
vhtcaps_mask->vht_supported_mcs_set.rx_map |= \
-
3 << 2 * (i - 1);
\
+
host_to_le16(3 << 2 * (i - 1));
\
vhtcaps->vht_supported_mcs_set.rx_map |= \
vhtcaps->vht_supported_mcs_set.rx_map |= \
- ssid->vht_rx_mcs_nss_ ##i << 2 * (i - 1); \
+ host_to_le16(ssid->vht_rx_mcs_nss_ ##i << \
+ 2 * (i - 1)); \
}
OVERRIDE_MCS(1);
}
OVERRIDE_MCS(1);
@@
-4009,8
+4011,9
@@
static void wpas_fst_update_mb_ie_cb(void *ctx, const u8 *addr,
}
}
-const u8 * wpas_fst_get_peer_first(void *ctx, struct fst_get_peer_ctx **get_ctx,
- Boolean mb_only)
+static const u8 * wpas_fst_get_peer_first(void *ctx,
+ struct fst_get_peer_ctx **get_ctx,
+ Boolean mb_only)
{
struct wpa_supplicant *wpa_s = ctx;
{
struct wpa_supplicant *wpa_s = ctx;
@@
-4022,8
+4025,9
@@
const u8 * wpas_fst_get_peer_first(void *ctx, struct fst_get_peer_ctx **get_ctx,
}
}
-const u8 * wpas_fst_get_peer_next(void *ctx, struct fst_get_peer_ctx **get_ctx,
- Boolean mb_only)
+static const u8 * wpas_fst_get_peer_next(void *ctx,
+ struct fst_get_peer_ctx **get_ctx,
+ Boolean mb_only)
{
return NULL;
}
{
return NULL;
}