From patchwork Tue Dec 31 08:36:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian-Hong Pan X-Patchwork-Id: 11313811 X-Patchwork-Delegate: luca@coelho.fi Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 80F90109A for ; Tue, 31 Dec 2019 08:39:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51EA2206E6 for ; Tue, 31 Dec 2019 08:39:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=endlessm-com.20150623.gappssmtp.com header.i=@endlessm-com.20150623.gappssmtp.com header.b="QtFPBRge" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726345AbfLaIjr (ORCPT ); Tue, 31 Dec 2019 03:39:47 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:35099 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725536AbfLaIjr (ORCPT ); Tue, 31 Dec 2019 03:39:47 -0500 Received: by mail-pl1-f195.google.com with SMTP id g6so15698594plt.2 for ; Tue, 31 Dec 2019 00:39:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessm-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BQtaeDD9iVM5+b30tZbRI2EHQA2GRCPLt5coFH0Hu7k=; b=QtFPBRgexpYA+27porJnxIo3FiID+P4q/uunZRO1911fhApxltA68KLt3FnSAPmSFg o3vDx3KQLkxMzc+YGjItwPwaa1bI3SccD7XL81cYet5UBwSk23N4Y7viJ7QZRzLkoQFf yDUUNPAO8r7K0glITDJkhKjbu+AYwXc+Digc/rjcCxzb87PeUOHNh2+Pa45hi2ep9t1i qmWznwyLzgGxDQJtw3q8xZTKSjka609jGyiKjnAJdw1sq78SjUUg31drO4vvVuEsRoXj WeLdMpnsodrBZJCTrolRCvvWA353118SUOGicN9U93xl4aZAQ/PCeW6ZDQBwCQOmaIfG eYIw== 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:mime-version :content-transfer-encoding; bh=BQtaeDD9iVM5+b30tZbRI2EHQA2GRCPLt5coFH0Hu7k=; b=ErLBhci4Unzey/jbD9aeuDwD3yQWGRbvDinHAW52nyqfaq3YFlfTwfUKQCtjy/fRqZ EsfzRF3ydPaQvgp5YU8C4k8miu/pPWjP11/98SwN/tB1OufCAJwYApbTvXJRuU2+39gH eKGJVf/ulnFPZcUCtHGwaZJXPoEouNdjaA/6kl8MkRP9BtoWHS1SIzrfYTC9uhIougSL Bs/x+qD4r0aj5Xlvfho2X+DapZAy01qTyWxNrcv/BZQgaBotMV0zUSYORS4zVIrRImhG bDZZhUXotUQIhsGgYcdjldYiYwgogdycdj+y+jA7RwwgcTqnCzgTm76/EkMFoYZAwQuh 4FuQ== X-Gm-Message-State: APjAAAVza4KIoGL6U7dB9/6o3YND1f27xMAjG5SDzFi5ZGMKxJ8rVsFW gmzGwCe096Z2LrbN34cudEsfyw== X-Google-Smtp-Source: APXvYqyogbKOzEE1A3fEkjBs2LajnnAHqltAyAdH5gr4gm+XpBJEB1ntQvC/9yctl9aSkv2SZI5teA== X-Received: by 2002:a17:90b:258:: with SMTP id fz24mr4782140pjb.6.1577781586060; Tue, 31 Dec 2019 00:39:46 -0800 (PST) Received: from starnight.8.8.8.8 (123-204-46-122.static.seed.net.tw. [123.204.46.122]) by smtp.gmail.com with ESMTPSA id z30sm56896800pfq.154.2019.12.31.00.39.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Dec 2019 00:39:45 -0800 (PST) From: Jian-Hong Pan To: Johannes Berg , Emmanuel Grumbach , Luca Coelho , Kalle Valo , "David S . Miller" , Shahar S Matityahu , Tova Mussai , Ayala Beker Cc: Intel Linux Wireless , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux@endlessm.com, Jian-Hong Pan Subject: [PATCH] iwlwifi: mvm: Revert "iwlwifi: mvm: fix scan config command size" Date: Tue, 31 Dec 2019 16:36:06 +0800 Message-Id: <20191231083604.5639-1-jian-hong@endlessm.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org The Intel(R) Dual Band Wireless AC 9461 WiFi keeps restarting until commit 06eb547c4ae4 ("wlwifi: mvm: fix scan config command size") is reverted. Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=206025 Fixes: commit 06eb547c4ae4 ("wlwifi: mvm: fix scan config command size") Signed-off-by: Jian-Hong Pan --- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index a046ac9fa852..a5af8f4128b1 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -1213,7 +1213,7 @@ static int iwl_mvm_legacy_config_scan(struct iwl_mvm *mvm) cmd_size = sizeof(struct iwl_scan_config_v2); else cmd_size = sizeof(struct iwl_scan_config_v1); - cmd_size += num_channels; + cmd_size += mvm->fw->ucode_capa.n_scan_channels; cfg = kzalloc(cmd_size, GFP_KERNEL); if (!cfg)