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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 03B91C3A5A1 for ; Thu, 22 Aug 2019 17:49:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE0B723402 for ; Thu, 22 Aug 2019 17:49:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566496157; bh=9u2CoFWIChXQB7BT8n5JYZmcQmil3bWK6/eJ7jJASD4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wAZnWO/n8h1SqptRArJOONHArzQ2ld+/6VJTFgkqAS4/OWQrQX/Yb1JxoVmENFpPY vZpktObh6gPph+Q5fA82mEmdTaMCaWNVv4Oow7PWTvtm2NeetQni/6qVuusOdk8B5o /YbCtvABulaiGoqNwgPz+6z6Xyl4bjBicJEqCaes= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731739AbfHVRWQ (ORCPT ); Thu, 22 Aug 2019 13:22:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:39974 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730997AbfHVRWO (ORCPT ); Thu, 22 Aug 2019 13:22:14 -0400 Received: from localhost (wsip-184-188-36-2.sd.sd.cox.net [184.188.36.2]) (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 44C96233FD; Thu, 22 Aug 2019 17:22:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566494533; bh=9u2CoFWIChXQB7BT8n5JYZmcQmil3bWK6/eJ7jJASD4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mI+sDNUOvIqDHD9o60nKk/RKgbHq2WG6lpuIPEP/CVz6uCMAggCvM/XJ3Ya/m2Ryq BeA5BZEw25TInwx2bRVFu7gk8gTtqiogMuhRN2FQV4cewjRmzUS3kv/hluPOrLR7R1 qsp7AL8QCpBEdf2GEZYvHpfh9oL6W7iMEvVBnq0g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Brian Norris , Johannes Berg , Sasha Levin Subject: [PATCH 4.4 11/78] mac80211: dont warn about CW params when not using them Date: Thu, 22 Aug 2019 10:18:15 -0700 Message-Id: <20190822171832.370119925@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190822171832.012773482@linuxfoundation.org> References: <20190822171832.012773482@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit d2b3fe42bc629c2d4002f652b3abdfb2e72991c7 ] ieee80211_set_wmm_default() normally sets up the initial CW min/max for each queue, except that it skips doing this if the driver doesn't support ->conf_tx. We still end up calling drv_conf_tx() in some cases (e.g., ieee80211_reconfig()), which also still won't do anything useful...except it complains here about the invalid CW parameters. Let's just skip the WARN if we weren't going to do anything useful with the parameters. Signed-off-by: Brian Norris Link: https://lore.kernel.org/r/20190718015712.197499-1-briannorris@chromium.org Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/driver-ops.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/net/mac80211/driver-ops.c b/net/mac80211/driver-ops.c index c258f1041d330..df2e4e3112177 100644 --- a/net/mac80211/driver-ops.c +++ b/net/mac80211/driver-ops.c @@ -169,11 +169,16 @@ int drv_conf_tx(struct ieee80211_local *local, if (!check_sdata_in_driver(sdata)) return -EIO; - if (WARN_ONCE(params->cw_min == 0 || - params->cw_min > params->cw_max, - "%s: invalid CW_min/CW_max: %d/%d\n", - sdata->name, params->cw_min, params->cw_max)) + if (params->cw_min == 0 || params->cw_min > params->cw_max) { + /* + * If we can't configure hardware anyway, don't warn. We may + * never have initialized the CW parameters. + */ + WARN_ONCE(local->ops->conf_tx, + "%s: invalid CW_min/CW_max: %d/%d\n", + sdata->name, params->cw_min, params->cw_max); return -EINVAL; + } trace_drv_conf_tx(local, sdata, ac, params); if (local->ops->conf_tx) -- 2.20.1