hostapd: add pending patches
[openwrt/svn-archive/archive.git] / package / hostapd / patches / 602-driver_nl80211-use-new-parameters-during-ibss-join.patch
1 From ffc4445958a3ed4064f2e1bf73fa478a61c5cf7b Mon Sep 17 00:00:00 2001
2 From: Antonio Quartulli <ordex@autistici.org>
3 Date: Sun, 3 Jun 2012 18:42:25 +0200
4 Subject: [PATCHv2 602/602] driver_nl80211: use new parameters during ibss join
5
6 Signed-hostap: Antonio Quartulli <ordex@autistici.org>
7 ---
8 src/drivers/driver_nl80211.c | 33 ++++++++++++++++++++++++++++++++-
9 1 file changed, 32 insertions(+), 1 deletion(-)
10
11 diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
12 index 22e7075..f510d18 100644
13 --- a/src/drivers/driver_nl80211.c
14 +++ b/src/drivers/driver_nl80211.c
15 @@ -6481,7 +6481,7 @@ static int wpa_driver_nl80211_ibss(struct wpa_driver_nl80211_data *drv,
16 struct wpa_driver_associate_params *params)
17 {
18 struct nl_msg *msg;
19 - int ret = -1;
20 + int ret = -1, i;
21 int count = 0;
22
23 wpa_printf(MSG_DEBUG, "nl80211: Join IBSS (ifindex=%d)", drv->ifindex);
24 @@ -6514,6 +6514,37 @@ retry:
25 wpa_printf(MSG_DEBUG, " * freq=%d", params->freq);
26 NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, params->freq);
27
28 + if (params->fixed_freq) {
29 + wpa_printf(MSG_DEBUG, " * fixed_freq");
30 + NLA_PUT_FLAG(msg, NL80211_ATTR_FREQ_FIXED);
31 + }
32 +
33 + if (params->beacon_interval > 0) {
34 + wpa_printf(MSG_DEBUG, " * beacon_interval=%d",
35 + params->beacon_interval);
36 + NLA_PUT_U32(msg, NL80211_ATTR_BEACON_INTERVAL,
37 + params->beacon_interval);
38 + }
39 +
40 + if (params->rates[0] > 0) {
41 + wpa_printf(MSG_DEBUG, " * basic_rates:");
42 + i = 0;
43 + while (i < NL80211_MAX_SUPP_RATES &&
44 + params->rates[i] > 0) {
45 + wpa_printf(MSG_DEBUG, " %.1f",
46 + (double)params->rates[i] / 2);
47 + i++;
48 + }
49 + NLA_PUT(msg, NL80211_ATTR_BSS_BASIC_RATES, i,
50 + params->rates);
51 + }
52 +
53 + if (params->mcast_rate > 0) {
54 + wpa_printf(MSG_DEBUG, " * mcast_rates=%.1f",
55 + (double)params->mcast_rate / 10);
56 + NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate);
57 + }
58 +
59 ret = nl80211_set_conn_keys(params, msg);
60 if (ret)
61 goto nla_put_failure;
62 --
63 1.7.9.4
64