From 1f8154c1de02def9219e3869430e0b690a0493e8 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 29 Aug 2012 16:06:24 +0000 Subject: hostapd: fix ap+sta issues git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33311 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/604-wpa_s-support-htmode-param.patch | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'package/hostapd/patches/604-wpa_s-support-htmode-param.patch') diff --git a/package/hostapd/patches/604-wpa_s-support-htmode-param.patch b/package/hostapd/patches/604-wpa_s-support-htmode-param.patch index 7e1a7a072..e540d4533 100644 --- a/package/hostapd/patches/604-wpa_s-support-htmode-param.patch +++ b/package/hostapd/patches/604-wpa_s-support-htmode-param.patch @@ -14,8 +14,6 @@ Signed-off-by: Antonio Quartulli wpa_supplicant/wpa_supplicant.c | 2 ++ 5 files changed, 88 insertions(+) -diff --git a/src/drivers/driver.h b/src/drivers/driver.h -index dda2fbc..28bd181 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -337,6 +337,8 @@ struct wpa_driver_associate_params { @@ -27,11 +25,9 @@ index dda2fbc..28bd181 100644 /** * bg_scan_period - Background scan period in seconds, 0 to disable -diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c -index 9783c96..d1257a7 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c -@@ -6493,6 +6493,22 @@ retry: +@@ -6545,6 +6545,22 @@ retry: NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate); } @@ -54,11 +50,9 @@ index 9783c96..d1257a7 100644 ret = nl80211_set_conn_keys(params, msg); if (ret) goto nla_put_failure; -diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c -index 3d6c0e6..d96b2ea 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c -@@ -1468,6 +1468,71 @@ static char * wpa_config_write_mcast_rate(const struct parse_data *data, +@@ -1463,6 +1463,71 @@ static char * wpa_config_write_mcast_rat } #endif /* NO_CONFIG_WRITE */ @@ -130,7 +124,7 @@ index 3d6c0e6..d96b2ea 100644 static int wpa_config_parse_rates(const struct parse_data *data, struct wpa_ssid *ssid, int line, const char *value) -@@ -1706,6 +1771,7 @@ static const struct parse_data ssid_fields[] = { +@@ -1701,6 +1766,7 @@ static const struct parse_data ssid_fiel { INT_RANGE(beacon_interval, 0, 1000) }, { FUNC(rates) }, { FUNC(mcast_rate) }, @@ -138,8 +132,6 @@ index 3d6c0e6..d96b2ea 100644 }; #undef OFFSET -diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h -index 8d152a4..7143277 100644 --- a/wpa_supplicant/config_ssid.h +++ b/wpa_supplicant/config_ssid.h @@ -505,6 +505,8 @@ struct wpa_ssid { @@ -151,11 +143,9 @@ index 8d152a4..7143277 100644 }; #endif /* CONFIG_SSID_H */ -diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c -index 59efa16..fc8762f 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -1379,6 +1379,8 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s, +@@ -1411,6 +1411,8 @@ void wpa_supplicant_associate(struct wpa i++; } params.mcast_rate = ssid->mcast_rate; @@ -164,6 +154,3 @@ index 59efa16..fc8762f 100644 } params.wpa_ie = wpa_ie; --- -1.7.9.4 - -- cgit v1.2.3