From patchwork Tue Jan 3 12:41:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend van Spriel X-Patchwork-Id: 639229 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BDC5C46467 for ; Tue, 3 Jan 2023 12:41:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237320AbjACMld (ORCPT ); Tue, 3 Jan 2023 07:41:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237550AbjACMlc (ORCPT ); Tue, 3 Jan 2023 07:41:32 -0500 Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 397FEDF6A for ; Tue, 3 Jan 2023 04:41:31 -0800 (PST) Received: by mail-qt1-x82e.google.com with SMTP id bp44so21790884qtb.0 for ; Tue, 03 Jan 2023 04:41:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=cSS8F/rKGNiGpoxFka3z9bGZCT6G8zFruXj9sEzA+6U=; b=VRxXv9j/NR6glaECZl58yhYNS8EjXmEu6/CNn75ortjKfx+XMwjDCr0VSwoLYybilk 7Hjd4FJKBeSfxMUGqk4HG10oO0mE13DB/Z8C8sE9y4EVuXYC+L3Xyf30AugHfApruVS1 G126+62oGIb123eMVfelp6Fuzvdqz5xawOjJE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cSS8F/rKGNiGpoxFka3z9bGZCT6G8zFruXj9sEzA+6U=; b=z9fZpgO7PmTGiYbttjOi0OE15/JfXcfKj+taKbROY78Da42X4JjHVsV69f0xzsKMVq iMTo6m5NxYe6nyGOu7UZK2f5HfCge1n+gQWDlBLQfKf+1SD2SS04FLdBp8j3kLh9X8xj GCQG0kIxV/MsIxJRNJhn2z29cZIpE0K95AbSmWhxniSj43BfhvglOkW0czZrDxn9C/uv YFeAN8p0TxViLPyGTB/yKZRc+pKGIlgtkUeIlQ8tgEJO/eWXasgckEn3Wsp3FZuPeJ3D hGFyK0z5XD8D3LM2ixWYxe65cE/nGvhBusM2h29KCP/Wy6bKuh5E+cT41Vquas8s2jcf OSDg== X-Gm-Message-State: AFqh2kpqBhFUeUfFb27ddYh90wBajw/AaRu0+6hQiNpYG6fmQTvHluTb 1ADhu52M4+px9aGSXsoNOG+RMu1waCqsIl1I X-Google-Smtp-Source: AMrXdXuCOZ9g5WIeevu1s08ELDNaYJItcMTUr7U2LWHojtNcQPu6m4YV2B91rwOIn5/99okVESDY6g== X-Received: by 2002:ac8:7778:0:b0:3ab:af31:ee3e with SMTP id h24-20020ac87778000000b003abaf31ee3emr14529394qtu.60.1672749690346; Tue, 03 Jan 2023 04:41:30 -0800 (PST) Received: from bld-bun-02.bun.broadcom.com ([192.19.148.250]) by smtp.gmail.com with ESMTPSA id t1-20020ac865c1000000b003a7e4129f83sm18439047qto.85.2023.01.03.04.41.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jan 2023 04:41:29 -0800 (PST) From: Arend van Spriel To: Kalle Valo Cc: linux-wireless@vger.kernel.org, Arend van Spriel Subject: [PATCH for-6.2 3/3] wifi: brcmfmac: change cfg80211_set_channel() name and signature Date: Tue, 3 Jan 2023 13:41:17 +0100 Message-Id: <20230103124117.271988-4-arend.vanspriel@broadcom.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20230103124117.271988-1-arend.vanspriel@broadcom.com> References: <20230103124117.271988-1-arend.vanspriel@broadcom.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org The function cfg80211_set_channel() is an static function in brcmfmac but the name is misleading. Hence rename it with 'brcmf' prefix. Also changing the parameters to avoid additional conversions. Signed-off-by: Arend van Spriel --- .../net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index b115902eb475..a9690ec4c850 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -7928,13 +7928,10 @@ brcmf_dump_obss(struct brcmf_if *ifp, struct cca_msrmnt_query req, } static s32 -cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev, - struct ieee80211_channel *chan, - enum nl80211_channel_type channel_type) +brcmf_set_channel(struct brcmf_cfg80211_info *cfg, struct ieee80211_channel *chan) { u16 chspec = 0; int err = 0; - struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy); struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg)); if (chan->flags & IEEE80211_CHAN_DISABLED) @@ -7994,7 +7991,7 @@ brcmf_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *ndev, /* Setting current channel to the requested channel */ info->filled = 0; - if (cfg80211_set_channel(wiphy, ndev, info->channel, NL80211_CHAN_HT20)) + if (brcmf_set_channel(cfg, info->channel)) return 0; /* Disable mpc */