parent
c4ce5f3937
commit
4ca03b54ee
@ -1,16 +0,0 @@ |
||||
--- a/src/drivers/driver_nl80211.c
|
||||
+++ b/src/drivers/driver_nl80211.c
|
||||
@@ -4418,10 +4418,10 @@ static void *i802_init(struct hostapd_da
|
||||
/* start listening for EAPOL on the default AP interface */
|
||||
add_ifidx(drv, drv->ifindex);
|
||||
|
||||
- if (params->bssid) {
|
||||
- if (hostapd_set_iface_flags(drv, drv->ifname, 0))
|
||||
- goto failed;
|
||||
+ if (hostapd_set_iface_flags(drv, drv->ifname, 0))
|
||||
+ goto failed;
|
||||
|
||||
+ if (params->bssid) {
|
||||
if (set_ifhwaddr(drv, drv->ifname, params->bssid))
|
||||
goto failed;
|
||||
}
|
@ -0,0 +1,10 @@ |
||||
--- a/src/drivers/driver_nl80211.c
|
||||
+++ b/src/drivers/driver_nl80211.c
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <netlink/genl/genl.h>
|
||||
#include <netlink/genl/family.h>
|
||||
#include <netlink/genl/ctrl.h>
|
||||
+#include <linux/rtnetlink.h>
|
||||
#include "nl80211_copy.h"
|
||||
|
||||
#include "common.h"
|
@ -1,11 +0,0 @@ |
||||
--- a/hostapd/hw_features.c
|
||||
+++ b/hostapd/hw_features.c
|
||||
@@ -329,7 +329,7 @@ static int ieee80211n_check_40mhz_5g(str
|
||||
if (!match) {
|
||||
for (i = 0; i < scan_res->num; i++) {
|
||||
struct wpa_scan_res *bss = scan_res->res[i];
|
||||
- ieee80211n_get_pri_sec_chan(bss, &pri_chan, &sec_chan);
|
||||
+ ieee80211n_get_pri_sec_chan(bss, &bss_pri_chan, &bss_sec_chan);
|
||||
if (pri_chan == bss_sec_chan &&
|
||||
sec_chan == bss_pri_chan) {
|
||||
wpa_printf(MSG_INFO, "Switch own primary and "
|
@ -1,33 +0,0 @@ |
||||
--- a/hostapd/ieee802_11.c
|
||||
+++ b/hostapd/ieee802_11.c
|
||||
@@ -1586,24 +1586,16 @@ hostapd_get_ht_capab(struct hostapd_data
|
||||
struct ht_cap_ie *ht_cap_ie,
|
||||
struct ht_cap_ie *neg_ht_cap_ie)
|
||||
{
|
||||
+ u16 cap;
|
||||
|
||||
os_memcpy(neg_ht_cap_ie, ht_cap_ie, sizeof(struct ht_cap_ie));
|
||||
- neg_ht_cap_ie->data.capabilities_info =
|
||||
- ht_cap_ie->data.capabilities_info & hapd->iconf->ht_capab;
|
||||
-
|
||||
- neg_ht_cap_ie->data.capabilities_info &= ~HT_CAP_INFO_SMPS_DISABLED;
|
||||
- if ((ht_cap_ie->data.capabilities_info & HT_CAP_INFO_SMPS_DISABLED) ==
|
||||
- (hapd->iconf->ht_capab & HT_CAP_INFO_SMPS_DISABLED))
|
||||
- neg_ht_cap_ie->data.capabilities_info |=
|
||||
- hapd->iconf->ht_capab & HT_CAP_INFO_SMPS_DISABLED;
|
||||
- else
|
||||
- neg_ht_cap_ie->data.capabilities_info |=
|
||||
- HT_CAP_INFO_SMPS_DISABLED;
|
||||
+ cap = le_to_host16(neg_ht_cap_ie->data.capabilities_info);
|
||||
+ cap &= hapd->iconf->ht_capab;
|
||||
+ cap |= (hapd->iconf->ht_capab & HT_CAP_INFO_SMPS_DISABLED);
|
||||
|
||||
/* FIXME: Rx STBC needs to be handled specially */
|
||||
- neg_ht_cap_ie->data.capabilities_info &= ~HT_CAP_INFO_RX_STBC_MASK;
|
||||
- neg_ht_cap_ie->data.capabilities_info |=
|
||||
- hapd->iconf->ht_capab & HT_CAP_INFO_RX_STBC_MASK;
|
||||
+ cap |= (hapd->iconf->ht_capab & HT_CAP_INFO_RX_STBC_MASK);
|
||||
+ neg_ht_cap_ie->data.capabilities_info = host_to_le16(cap);
|
||||
}
|
||||
#endif /* CONFIG_IEEE80211N */
|
||||
|
Loading…
Reference in new issue