diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-04-26 19:48:06 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-04-26 19:48:06 +0000 |
commit | 27a58eb4ae42ab99ef0734c7910e75d2df71d99c (patch) | |
tree | f479269f34afb86086b18261ebbaab75a203b4de /package/network/services/hostapd/patches/440-dynamic_20_40_mhz.patch | |
parent | dc503026ad0a0a66fb77663e0e68d02fa63ad1b4 (diff) | |
download | master-187ad058-27a58eb4ae42ab99ef0734c7910e75d2df71d99c.tar.gz master-187ad058-27a58eb4ae42ab99ef0734c7910e75d2df71d99c.tar.bz2 master-187ad058-27a58eb4ae42ab99ef0734c7910e75d2df71d99c.zip |
hostapd: update to version 2014-04-24, fixes some dfs related issues
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40571 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/hostapd/patches/440-dynamic_20_40_mhz.patch')
-rw-r--r-- | package/network/services/hostapd/patches/440-dynamic_20_40_mhz.patch | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/package/network/services/hostapd/patches/440-dynamic_20_40_mhz.patch b/package/network/services/hostapd/patches/440-dynamic_20_40_mhz.patch index 24ab2d52ee..af2fb26c81 100644 --- a/package/network/services/hostapd/patches/440-dynamic_20_40_mhz.patch +++ b/package/network/services/hostapd/patches/440-dynamic_20_40_mhz.patch @@ -1,6 +1,6 @@ --- a/hostapd/config_file.c +++ b/hostapd/config_file.c -@@ -2644,6 +2644,10 @@ static int hostapd_config_fill(struct ho +@@ -2648,6 +2648,10 @@ static int hostapd_config_fill(struct ho line); return 1; } @@ -97,29 +97,25 @@ u8 * hostapd_eid_ht_capabilities(struct hostapd_data *hapd, u8 *eid) -@@ -92,12 +94,15 @@ u8 * hostapd_eid_ht_operation(struct hos +@@ -92,6 +94,9 @@ u8 * hostapd_eid_ht_operation(struct hos - oper->control_chan = hapd->iconf->channel; + oper->primary_chan = hapd->iconf->channel; oper->operation_mode = host_to_le16(hapd->iface->ht_op_mode); -- if (hapd->iconf->secondary_channel == 1) -- oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE | -- HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; -- if (hapd->iconf->secondary_channel == -1) -- oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW | -- HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; -+ -+ if (!hapd->iface->force_20mhz) { -+ if (hapd->iconf->secondary_channel == 1) -+ oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE | -+ HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; -+ if (hapd->iconf->secondary_channel == -1) -+ oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW | -+ HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; -+ } ++ if (hapd->iface->force_20mhz) ++ goto skip; ++ + if (hapd->iconf->secondary_channel == 1) + oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE | + HT_INFO_HT_PARAM_STA_CHNL_WIDTH; +@@ -99,6 +104,7 @@ u8 * hostapd_eid_ht_operation(struct hos + oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW | + HT_INFO_HT_PARAM_STA_CHNL_WIDTH; ++skip: pos += sizeof(*oper); -@@ -291,3 +296,84 @@ void hostapd_get_ht_capab(struct hostapd + return pos; +@@ -288,3 +294,84 @@ void hostapd_get_ht_capab(struct hostapd neg_ht_cap->ht_capabilities_info = host_to_le16(cap); } |