Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp276903pxx; Wed, 28 Oct 2020 04:48:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqnBEpsJDEDvfSoqPbmUScT4AHR+T9RqHipPaA0Ed3TyVkCD6B5l3jM/zjnqDHVTwCqIJx X-Received: by 2002:a17:906:1618:: with SMTP id m24mr7477510ejd.438.1603885725613; Wed, 28 Oct 2020 04:48:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603885725; cv=none; d=google.com; s=arc-20160816; b=nyN/tWZeQtGU/iZhj00h5dPXysClZfAy6T729bGqzK/rphHgmAtpGwA1YvKQ91Qkar n+PRihUviHKBYdi2tJSQoHMamd+VhW/C/MmYfghrWxEa0sBOGZsCBfjXlaOCh59LXiQE F06lnQ7dhgF61z1iaPRv0Bhrn/pjZvJYaZcXq++DwPjh94JCn4zgAsJtFLTQh7DfnBBY xQjsgrESLvIAN3gvqI1uTVyH6ro1k1CKYTdlN6nezgGXj0iFCk7q8js0WKLHbT3s/InC qQBRfjvGaWLJkBb8U391NG8X1faY5UAYJP1xMSw5uofUFhJfaoX1jDEi0QEU+YxbyUXG izKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EripmMuSkK5VNbwcsz1VOiWyXZ/uO+AT7XY5ehCFr0k=; b=Qr5IjjpVWynANud6yOHrwWQs4JoiPfI4K7vjKpXbApdA0X9r70xTyE7WDrKuiBgqja 1FCW7hLwgtjC/HkxkrXHC+lYSzc/jSuHz2pD/y+HrVryN9Rm8mvh85HELSqpLYItwJ14 obMjjYR7zTP/TFfqcprKEUMXX0oImM2bNfsAMz+3kjD0M4nZEJ7nHPagjmgVnBnnyHX/ ysFUu8YxheMgrh6p/5OQT0qmVIxUsh5CAzM2iLYAC4Fvdh+MGBLqduEcDP79R7XoZ0xj MSBAYa6fs68oQqFyh6OjVc6qB1QVTa7NltyIEFeVGFhfCINSTr6/VrJCZfV7O0wlX8m+ FsJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="O16gcX/S"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o10si2705925ejr.482.2020.10.28.04.48.23; Wed, 28 Oct 2020 04:48:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="O16gcX/S"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1794457AbgJ0PLz (ORCPT + 99 others); Tue, 27 Oct 2020 11:11:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:34996 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1788920AbgJ0PBQ (ORCPT ); Tue, 27 Oct 2020 11:01:16 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D55B520714; Tue, 27 Oct 2020 15:01:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810874; bh=J9kcf2DzKRspPP0olRjb8LFpJR0H5RWUkpY0w+xDZr4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O16gcX/SAwLwUQbRSXR1y+qhj2ZuBiSJPQeEliskcGRDJ3drJhZvzEcf/TH2oWEyt sXY4ud8KQDQjExyexTUfg640yawXBH8AZWWtXor9+H2G53bhkb/g5YuuIywi8NuZla NEd/pgDnUetBOaKgBsXaNydc4Y06RzOtf3GPmbiE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Emmanuel Grumbach , Luca Coelho , Sasha Levin Subject: [PATCH 5.8 294/633] iwlwifi: mvm: split a print to avoid a WARNING in ROC Date: Tue, 27 Oct 2020 14:50:37 +0100 Message-Id: <20201027135536.463031859@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Emmanuel Grumbach [ Upstream commit 903b3f9badf1d54f77b468b96706dab679b45b14 ] A print in the remain on channel code was too long and caused a WARNING, split it. Signed-off-by: Emmanuel Grumbach Fixes: dc28e12f2125 ("iwlwifi: mvm: ROC: Extend the ROC max delay duration & limit ROC duration") Signed-off-by: Luca Coelho Link: https://lore.kernel.org/r/iwlwifi.20200930102759.58d57c0bdc68.Ib06008665e7bf1199c360aa92691d9c74fb84990@changeid Signed-off-by: Luca Coelho Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index 77916231ff7d3..03b73003b0095 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -3685,9 +3685,12 @@ static int iwl_mvm_send_aux_roc_cmd(struct iwl_mvm *mvm, tail->apply_time_max_delay = cpu_to_le32(delay); IWL_DEBUG_TE(mvm, - "ROC: Requesting to remain on channel %u for %ums (requested = %ums, max_delay = %ums, dtim_interval = %ums)\n", - channel->hw_value, req_dur, duration, delay, - dtim_interval); + "ROC: Requesting to remain on channel %u for %ums\n", + channel->hw_value, req_dur); + IWL_DEBUG_TE(mvm, + "\t(requested = %ums, max_delay = %ums, dtim_interval = %ums)\n", + duration, delay, dtim_interval); + /* Set the node address */ memcpy(tail->node_addr, vif->addr, ETH_ALEN); -- 2.25.1