Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp3964663pxb; Mon, 8 Feb 2021 04:51:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZ1b/hkUI+Gavr8MXnTnu6Jmm2UN5dMUyn/TqMPF0kAZQjacJwPH0zfiQqvufbr8g5T9ug X-Received: by 2002:a17:907:724a:: with SMTP id ds10mr16165075ejc.28.1612788705850; Mon, 08 Feb 2021 04:51:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612788705; cv=none; d=google.com; s=arc-20160816; b=00I2qX+6bcbvbjKRGg01g3dok3q1Vaq3T8bijcuxD4XMgR0+E/wXiCNYjCuNG876vB Bhyc1tdXazXiL7kTcRfrxjlRKJQh7tqdEQjTEc7Dw8c6v8rAqF5Gm+2aZZaYHErAY/8F dwYeiJEN5A2Kgi0Fc4Or8HUB2sS6+HunV41T+K21iMgv/l8w3Vk7MJpu+hoJqBFcWkv8 8PHEH8xeh3TeiRKFEAiMShLvl3IbIx7zuJE7CWmZuyYABd+uK9MEHU0Rt0OUXcv8eGMb WdgWoWJ5d7UDUl9cOu1WAfwNBRataFFFxspWjvNxhoOTzihNYbxEyRjwpMDqgCunKB6A LHRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from; bh=3hZk/wQTnS9sfWuiw0XKTjhJWwlRTy3hSpQkTsBKDEQ=; b=LyBZR8h8AI2PiYu5G2SASKpshq4MhKuh9mBYMCSVhUeI5LFYPO0ml+Unv/s91MMGg+ Mi5CKEmx4PHtsdyl3ECZym5gz8gsQKGIbjUClF67SnPK/mkCAm85TyL+vzMZl5hIffpl z10Xw4X7SPdEIeJkhf+cKp8i7ulSpYlhhQijWDCzmnR1dmPFLrau66ue3JjZ3Djb0gNz B1VcET+4z+b0oY8gDeBlD581myf0IGgACZH10bWFrODP6CcqV/7qLnPZNmic4hnX8hdU Fn7DPeTfw6dZKKjlujUJvZbvBArK8FeI8sOycBbMmXFmobbJpECtsMIdvmt32vvoXH7K GkSg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c16si11509530edu.304.2021.02.08.04.51.23; Mon, 08 Feb 2021 04:51:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229756AbhBHMur (ORCPT + 99 others); Mon, 8 Feb 2021 07:50:47 -0500 Received: from paleale.coelho.fi ([176.9.41.70]:44504 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230191AbhBHMuE (ORCPT ); Mon, 8 Feb 2021 07:50:04 -0500 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=redipa.ger.corp.intel.com) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1l95yK-0047PC-1Q; Mon, 08 Feb 2021 14:48:56 +0200 From: Luca Coelho To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org Date: Mon, 8 Feb 2021 14:48:45 +0200 Message-Id: X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210208124847.1934441-1-luca@coelho.fi> References: <20210208124847.1934441-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on farmhouse.coelho.fi X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham autolearn_force=no version=3.4.4 Subject: [PATCH 10/12] iwlwifi: correction of group-id once sending REPLY_ERROR Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Mukesh Sisodiya Once sending the REPLY_ERROR group ID is not set and this lead to get it set to wrong value LONG_GROUP later in default handling Fix this by checking the REPLY_ERROR and avoid changing the Group ID Signed-off-by: Mukesh Sisodiya Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c index f0985453c80b..60e0db4a5e20 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c @@ -13,6 +13,7 @@ #include "iwl-fh.h" #include "queue/tx.h" #include +#include "fw/api/commands.h" struct iwl_trans *iwl_trans_alloc(unsigned int priv_size, struct device *dev, @@ -161,8 +162,10 @@ int iwl_trans_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd) if (!(cmd->flags & CMD_ASYNC)) lock_map_acquire_read(&trans->sync_cmd_lockdep_map); - if (trans->wide_cmd_header && !iwl_cmd_groupid(cmd->id)) - cmd->id = DEF_ID(cmd->id); + if (trans->wide_cmd_header && !iwl_cmd_groupid(cmd->id)) { + if (cmd->id != REPLY_ERROR) + cmd->id = DEF_ID(cmd->id); + } ret = iwl_trans_txq_send_hcmd(trans, cmd); -- 2.30.0