From patchwork Thu Apr 20 13:49:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Abinader X-Patchwork-Id: 752813 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w80cZ5ny0z9ryQ for ; Thu, 20 Apr 2017 23:50:22 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="n9khvDYo"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KU4XJtU8"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=byqveDjmXIZ9NPPSvY3ItYWpUZwp+Kkmvz/Mih3eUhY=; b=n9khvDYoddENJJ pAQFDT30BwNqaqhXInjFxFeb2B0Q3sfg+v5AEGE/KDLc9dvgTjIysaSMxoXtYS0ZiqGr6cstOegJS vI6Eynf4yU1f1gTE98eV+QYwDnU78cVoaBm80E7AM717jBY6ttPkc2YrCfvPnYwLwYYqhrIOiZXN4 1I24CLJyk8KCTHPAccwMIL50O/0vlSeUcnNEiqop1IURSmgSMmTA2l+A1pvEx2BlwN94FvHXDNjXa BlZxMz5GG7PFcAFmRO3M8luq1+mzmZFfKQeNo6eD8l/pnW0mAK6vAA8ZOPtkuVlCI2T+pd6f5ADTk vhf0spx6pGNugXOIW5aQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d1CTR-0003Gj-O9; Thu, 20 Apr 2017 13:50:17 +0000 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d1CTO-00024G-NB for lede-dev@lists.infradead.org; Thu, 20 Apr 2017 13:50:16 +0000 Received: by mail-wr0-x243.google.com with SMTP id w50so2836174wrc.0 for ; Thu, 20 Apr 2017 06:49:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=qMcb7eUrpGCmZ4Vi7kVf8t0OzypdvP4syE6QAU1uPJo=; b=KU4XJtU8Z7pZr+/BMVZYabBSe0pDdTqcZSOEeax32uTMSYt9vvDORu2IsezexkYx0U EBmXdTVLjPep2R4Lqv65ov3PxWrHyuUCYpPd4lo6+y8ealR/CUXfVdSR2Gru+uQCh2DY irMPCZAWOrF6eWNDUktwA6/PCAjXmnVgxz2ekhSot0+3P+PtfppPqtQ/KUdh4gerT79q vNZVwvHKZuzdRxpiBBq2eiDNd3gnCarB1WZ9aCQ9MR4xFIkxNQs2nLmrU5CX0ffiq4/z SnLuQUZfBFifF1KGtaCzr/+t5GeBilmQSS/9MAlt93vxiJaF9s8srSz/e1zzRb16iCcM fO9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qMcb7eUrpGCmZ4Vi7kVf8t0OzypdvP4syE6QAU1uPJo=; b=ZauBfGtK/XBDvjYlcbMy3hdgJUyJ+nUB8yiKWrdLZSdWoHCyx9S97cJl666VgMw5tg rL8OqPi+TZ+/ZbJGVpgPxTCQl/LRVmMXXH3VHFMjATv3cvqL8DbUPRN1r50laq+Sbvx5 i6pGz5PfaR5p9wqbkooj5QmVgHUabcAItlLU0FU+DzYL0+yjwpmhh/7grlErcd8C2MA0 UXOm5aehuOtYB+40dq/OenYuT5Nhb5sDS8NjarV0oi1pk81UgtiqqXPqQGxBsiCnsDah Ja95T5B2vXbWEOQzPAAzTOES8pMbC9QK0v0ouG/bqUnzCIPvg/ps/0AGYSFr2TM2M7t3 rAEQ== X-Gm-Message-State: AN3rC/7e+gp09yfmcNUdAQ1vWxJWa6UOkuYG4MPfXiqet9HLm3oiObg1 o7FhPMndrsx84tIctyQ= X-Received: by 10.223.139.22 with SMTP id n22mr7639592wra.38.1492696192239; Thu, 20 Apr 2017 06:49:52 -0700 (PDT) Received: from localhost.localdomain ([193.240.222.1]) by smtp.gmail.com with ESMTPSA id e21sm8187645wma.5.2017.04.20.06.49.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Apr 2017 06:49:50 -0700 (PDT) From: Eduardo Abinader To: lede-dev@lists.infradead.org Date: Thu, 20 Apr 2017 15:49:41 +0200 Message-Id: <20170420134941.11071-1-eduardoabinader@gmail.com> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170420_065014_917269_9B7CD1CF X-CRM114-Status: UNSURE ( 8.35 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c0c:0:0:0:243 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (eduardoabinader[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH] mac80211.sh: adjust HT40 control channel X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Abinader , nbd@nbd.name MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org For some channels, like FCC 165, the determination of the control channel is being done disregarding mac80211 config, which is HT40- (actually the channel is 20Mhz, we use here hostapd fallback to 20MHz). Hence, this patch let the previous logic decide for the cases where HT40+- are allowed and update ht40_capab, if only one of these configs is allowed (+ or -). Signed-off-by: Eduardo Abinader --- .../mac80211/files/lib/netifd/wireless/mac80211.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index 9ebd76be49..8b55331dbf 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -84,6 +84,23 @@ mac80211_add_capabilities() { export -n -- "$__var=$__out" } +mac80211_get_ht40_capab() { + phy=$1 + channel=$2 + + freq=$(get_freq $phy $channel) + [ -z "$freq" ] && return + + value=$(iw phy $phy channels|grep -vi disabled) + + [ -z "$(echo "$value"|grep "$freq")" ] && return + value=$(echo $value|sed 's/'$freq'[^{*}]*widths:/{}/'|sed 's/.*{} //'|sed 's/ \*.*//') + + [ $(echo $value|grep -o HT40|wc -l) -gt 1 ] && return + + echo "$value"|sed 's/.*HT40//'|sed 's/ .*//' +} + mac80211_hostapd_setup_base() { local phy="$1" @@ -121,6 +138,9 @@ mac80211_hostapd_setup_base() { esac ;; esac + adjust_ht40=$(mac80211_get_ht40_capab $phy $channel) + [ -n "$adjust_ht40" ] && ht_capab="[HT40$adjust_ht40]" + [ "$auto_channel" -gt 0 ] && ht_capab="[HT40+]" ;; *) ieee80211n= ;;