From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 952F0C4332D for ; Wed, 23 Dec 2020 02:42:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 50D752256F for ; Wed, 23 Dec 2020 02:42:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731090AbgLWClz (ORCPT ); Tue, 22 Dec 2020 21:41:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:52686 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729957AbgLWCXT (ORCPT ); Tue, 22 Dec 2020 21:23:19 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3D51422D57; Wed, 23 Dec 2020 02:22:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608690159; bh=EkYHASMxe69mxWaSDobST7ZfA03gtcpPRhoeHRkwEUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iC9EXNBgRAInE8EL3QyvuqcpbJbKYl449Z018vXIYpvkUftxuwvv5sMX0K+a/2gkh 8EzyOOwmhsZqGviACVDrqqr3eTy45aKeBPOgXLcVlSABa19bxhbeIZ3gm21a3/awAc MqTwaJORAdIIzFBk6/OR2mztuwyP3Cwy64dL1KI0TnKFxoGZxcVSoTx6vUSHpOw+kn u36ru/er9woF01w9N07qgEBFF50FXDjq7bUU2wblM3Ze1cHmjKOG3v0EITvO8qvmwn NJLr+z41MHiHaSn7rsBVAiSOfJvl/9oZhYudb72fSDYGHVyz5rVTi3gTuAO8ifJIZG u46YxWvDNlKSw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Avraham Stern , Luca Coelho , Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 77/87] nl80211: always accept scan request with the duration set Date: Tue, 22 Dec 2020 21:20:53 -0500 Message-Id: <20201223022103.2792705-77-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223022103.2792705-1-sashal@kernel.org> References: <20201223022103.2792705-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Avraham Stern [ Upstream commit c837cbad40d949feaff86734d637c7602ae0b56b ] Accept a scan request with the duration set even if the driver does not support setting the scan dwell. The duration can be used as a hint to the driver, but the driver may use its internal logic for setting the scan dwell. Signed-off-by: Avraham Stern Signed-off-by: Luca Coelho Link: https://lore.kernel.org/r/iwlwifi.20201129172929.9491a12f9226.Ia9c5b24fcefc5ce5592537507243391633a27e5f@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/nl80211.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index fbc8875502c3e..a5383de7a796d 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -7289,12 +7289,6 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info) } if (info->attrs[NL80211_ATTR_MEASUREMENT_DURATION]) { - if (!wiphy_ext_feature_isset(wiphy, - NL80211_EXT_FEATURE_SET_SCAN_DWELL)) { - err = -EOPNOTSUPP; - goto out_free; - } - request->duration = nla_get_u16(info->attrs[NL80211_ATTR_MEASUREMENT_DURATION]); request->duration_mandatory = -- 2.27.0