From patchwork Wed Feb 28 21:50:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 879443 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=candelatech.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="YJGERqeW"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::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 3zs8RS16X1z9s0t for ; Thu, 1 Mar 2018 08:52:04 +1100 (AEDT) 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:Message-Id:Date: Subject: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=eUCHJY+vQ+KMrN1LkU1BhP/U0e0jQkEjmpLvvpB0Bzs=; b=YJG ERqeWTXE8V2Gl5VhFA1MxmbZpBTPg5U3k8gxen4rTf+4opRgSFteGAxQkUVX4QjOjKdac6uvSAryd JQWfVONuHssP5wqe5uwuOSssFBN05vFK2BHa1jx/wMqPFPDgYmhkWuqvrxKXAZ9PWraJvF74XlS1o 0C/5X18whox36mMrdVD/E4enpXbS8hZLHsxAVWey52whIjrgMywYTv0WtZTsbygGpUM4grd5/KnK3 jpfollZNIdJdnkw61Msv+ihXTbYf9t6N7z25q9+hXUMtI5sv+7WA3LEP6t76cMekld2GlY1NeaP9x 92pI73qks1vW9bIfcLxXXbZx/ImtN1Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1er9dI-0004UK-7D; Wed, 28 Feb 2018 21:51:28 +0000 Received: from mail2.candelatech.com ([208.74.158.173]) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1er9d1-0004T7-It for hostap@lists.infradead.org; Wed, 28 Feb 2018 21:51:12 +0000 Received: from v-f24-64.candelatech.com (firewall.candelatech.com [50.251.239.81]) by mail2.candelatech.com (Postfix) with ESMTP id 8872A40A539; Wed, 28 Feb 2018 13:50:55 -0800 (PST) From: greearb@candelatech.com To: hostap@lists.infradead.org Subject: [PATCH] supplicant: Allow disabling VHT sgi capability bits Date: Wed, 28 Feb 2018 13:50:48 -0800 Message-Id: <1519854648-26566-1-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 2.7.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180228_135111_658123_3B49888D X-CRM114-Status: UNSURE ( 6.04 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ben Greear MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Ben Greear This provides similar features to what was already available for HT overrides. Probe requests look correct, and vht capabilities shown in debugfs look as expected. Signed-off-by: Ben Greear --- wpa_supplicant/wpa_supplicant.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index d4f528b..46eca5d 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -4644,6 +4644,12 @@ void wpa_supplicant_apply_vht_overrides( vhtcaps_mask->vht_capabilities_info = host_to_le32(ssid->vht_capa_mask); #ifdef CONFIG_HT_OVERRIDES + if (ssid->disable_sgi) { + vhtcaps_mask->vht_capabilities_info |= (VHT_CAP_SHORT_GI_80 | VHT_CAP_SHORT_GI_160); + vhtcaps->vht_capabilities_info &= ~(VHT_CAP_SHORT_GI_80 | VHT_CAP_SHORT_GI_160); + wpa_msg(wpa_s, MSG_DEBUG, "disable-sgi override specified, vht-caps: 0x%x", + vhtcaps->vht_capabilities_info); + } if (ssid->max_oper_chwidth != VHT_CHANWIDTH_USE_HT) { // USE_HT is default value for this, ignore it. vhtcaps_mask->vht_capabilities_info |= VHT_CAP_SUPP_CHAN_WIDTH_MASK; vhtcaps->vht_capabilities_info &= ~VHT_CAP_SUPP_CHAN_WIDTH_MASK;