diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-03-26 23:33:47 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-26 23:33:47 +0000 |
commit | 9c7784e5f3c4e3e1f6d8ede0e20d2993e9c01c08 (patch) | |
tree | 20bd07003fa92d1c6a089c85261b617029125949 /package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch | |
parent | 39370cbe25809c2b613fe19ff731e8e9022e4934 (diff) | |
download | upstream-9c7784e5f3c4e3e1f6d8ede0e20d2993e9c01c08.tar.gz upstream-9c7784e5f3c4e3e1f6d8ede0e20d2993e9c01c08.tar.bz2 upstream-9c7784e5f3c4e3e1f6d8ede0e20d2993e9c01c08.zip |
hostapd: update hostapd to 2015-03-25
madwifi was dropped upstream, can't find it anywhere in OpenWrt
either, thus finally burrying madwifi.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 45045
Diffstat (limited to 'package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch')
-rw-r--r-- | package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch b/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch index 46a0ef162e..730cc31650 100644 --- a/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch +++ b/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch @@ -10,7 +10,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org> --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c -@@ -9023,7 +9023,7 @@ static int wpa_driver_nl80211_ibss(struc +@@ -4398,7 +4398,7 @@ static int wpa_driver_nl80211_ibss(struc struct wpa_driver_associate_params *params) { struct nl_msg *msg; @@ -19,20 +19,20 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org> int count = 0; wpa_printf(MSG_DEBUG, "nl80211: Join IBSS (ifindex=%d)", drv->ifindex); -@@ -9069,6 +9069,37 @@ retry: - params->beacon_int); - } +@@ -4425,6 +4425,37 @@ retry: + nl80211_put_beacon_int(msg, params->beacon_int)) + goto fail; + if (params->fixed_freq) { + wpa_printf(MSG_DEBUG, " * fixed_freq"); -+ NLA_PUT_FLAG(msg, NL80211_ATTR_FREQ_FIXED); ++ nla_put_flag(msg, NL80211_ATTR_FREQ_FIXED); + } + -+ if (params->beacon_interval > 0) { -+ wpa_printf(MSG_DEBUG, " * beacon_interval=%d", -+ params->beacon_interval); -+ NLA_PUT_U32(msg, NL80211_ATTR_BEACON_INTERVAL, -+ params->beacon_interval); ++ if (params->beacon_int > 0) { ++ wpa_printf(MSG_DEBUG, " * beacon_int=%d", ++ params->beacon_int); ++ nla_put_u32(msg, NL80211_ATTR_BEACON_INTERVAL, ++ params->beacon_int); + } + + if (params->rates[0] > 0) { @@ -44,16 +44,16 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org> + (double)params->rates[i] / 2); + i++; + } -+ NLA_PUT(msg, NL80211_ATTR_BSS_BASIC_RATES, i, ++ nla_put(msg, NL80211_ATTR_BSS_BASIC_RATES, i, + params->rates); + } + + if (params->mcast_rate > 0) { -+ wpa_printf(MSG_DEBUG, " * mcast_rates=%.1f", ++ wpa_printf(MSG_DEBUG, " * mcast_rate=%.1f", + (double)params->mcast_rate / 10); -+ NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate); ++ nla_put_u32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate); + } + ret = nl80211_set_conn_keys(params, msg); if (ret) - goto nla_put_failure; + goto fail; |