summaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch')
-rw-r--r--package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch b/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch
index 543e2a6193..30bb2dc14c 100644
--- a/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch
+++ b/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch
@@ -16,8 +16,8 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
-@@ -447,6 +447,8 @@ struct wpa_driver_associate_params {
- int fixed_freq;
+@@ -541,6 +541,8 @@ struct wpa_driver_associate_params {
+
unsigned char rates[NL80211_MAX_SUPP_RATES];
int mcast_rate;
+ int ht_set;
@@ -27,8 +27,8 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
* bssid_hint - BSSID of a proposed AP
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
-@@ -9100,6 +9100,22 @@ retry:
- NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate);
+@@ -4456,6 +4456,22 @@ retry:
+ nla_put_u32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate);
}
+ if (params->ht_set) {
@@ -43,16 +43,16 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
+ wpa_printf(MSG_DEBUG, " * ht=HT40-");
+ break;
+ }
-+ NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
++ nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
+ params->htmode);
+ }
+
ret = nl80211_set_conn_keys(params, msg);
if (ret)
- goto nla_put_failure;
+ goto fail;
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
-@@ -1608,6 +1608,71 @@ static char * wpa_config_write_mcast_rat
+@@ -1754,6 +1754,71 @@ static char * wpa_config_write_mcast_rat
}
#endif /* NO_CONFIG_WRITE */
@@ -124,7 +124,7 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
static int wpa_config_parse_rates(const struct parse_data *data,
struct wpa_ssid *ssid, int line,
const char *value)
-@@ -1883,6 +1948,7 @@ static const struct parse_data ssid_fiel
+@@ -2042,6 +2107,7 @@ static const struct parse_data ssid_fiel
{ INT_RANGE(fixed_freq, 0, 1) },
{ FUNC(rates) },
{ FUNC(mcast_rate) },
@@ -134,8 +134,8 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
#endif /* CONFIG_MACSEC */
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
-@@ -644,6 +644,8 @@ struct wpa_ssid {
- int fixed_freq;
+@@ -678,6 +678,8 @@ struct wpa_ssid {
+
unsigned char rates[NL80211_MAX_SUPP_RATES];
double mcast_rate;
+ int ht_set;
@@ -145,7 +145,7 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
/**
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -1956,6 +1956,8 @@ static void wpas_start_assoc_cb(struct w
+@@ -2273,6 +2273,8 @@ static void wpas_start_assoc_cb(struct w
i++;
}
params.mcast_rate = ssid->mcast_rate;