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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2466C61DA4 for ; Mon, 13 Mar 2023 10:45:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230045AbjCMKpA (ORCPT ); Mon, 13 Mar 2023 06:45:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230167AbjCMKov (ORCPT ); Mon, 13 Mar 2023 06:44:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A561132CF1 for ; Mon, 13 Mar 2023 03:44:49 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 38225611C0 for ; Mon, 13 Mar 2023 10:44:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4A9D0C433EF; Mon, 13 Mar 2023 10:44:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678704288; bh=rHD8j+fOkzYz1zDOGWQvytNZEFYvz52aat9W/N8a6Ic=; h=Subject:To:Cc:From:Date:From; b=PJO90pczx7Oypwcn6YLvsthAjhWC405mOzPR5XVxQHHfOpNS9P7U3Bgjy1T+XSCRT B5yLruuqe55kObpwM1bgv0fQ7gQFRYlV+bepcENG19mrq9svs4hW0SUNJlnhoCdTkd Q3799GqFwfOeH9/34AsUO2KlxduAV8KYqbHaoOGU= Subject: FAILED: patch "[PATCH] staging: rtl8723bs: Pass correct parameters to" failed to apply to 5.10-stable tree To: hdegoede@redhat.com, gregkh@linuxfoundation.org Cc: From: Date: Mon, 13 Mar 2023 11:44:46 +0100 Message-ID: <167870428635155@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x d17789edd6a8270c38459e592ee536a84c6202db # git commit -s git send-email --to '' --in-reply-to '167870428635155@kroah.com' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: d17789edd6a8 ("staging: rtl8723bs: Pass correct parameters to cfg80211_get_bss()") 6994aa430368 ("staging: rtl8723bs: fix camel case in struct ndis_802_11_ssid") d8b322b60da6 ("staging: rtl8723bs: fix camel case in struct ndis_802_11_conf") d3fcee1b78a5 ("staging: rtl8723bs: fix camel case in struct wlan_bssid_ex") 2a62ff13132a ("staging: rtl8723bs: remove commented out condition") ddd7c8b0033b ("staging: rtl8723bs: remove 5Ghz code blocks") ec84d0ae54a6 ("staging: rtl8723bs: remove 5Ghz code related to channel plan definition") 708180a92cd8 ("staging: rtl8723bs: remove all 5Ghz network types") 403e6946d119 ("staging: rtl8723bs: remove if (true) statement") 2172a6576388 ("staging: rtl8723bs: remove commented out RT_ASSERT occurrences") 98dc120895a9 ("staging: rtl8723bs: split too long line") 5a94f5c84281 ("staging: rtl8723bs: fix indentation in if block") 79df841b4350 ("staging: rtl8723bs: replace DBG_871X_LEVEL logs with netdev_*()") 027ffa10b80b ("staging: rtl8723bs: remove sdio_drv_priv structure") ee31d57e4022 ("staging: rtl8723bs: remove unnecessary dump_drv_version() usage") a2e2a05d5d57 ("staging: rtl8723bs: remove unnecessary goto jumps") 5ffbfcf38b80 ("staging: rtl8723bs: remove empty ifdef blocks conditioned to DEBUG_CFG80211 definition") dcc48e083749 ("staging: rtl8723bs: remove all DBG_8192C logs") af6afdb63f17 ("staging: rtl8723bs: split long lines") e427bdd8e1e5 ("staging: rtl8723bs: rewrite comparison to null") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From d17789edd6a8270c38459e592ee536a84c6202db Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 6 Mar 2023 16:35:12 +0100 Subject: [PATCH] staging: rtl8723bs: Pass correct parameters to cfg80211_get_bss() To last 2 parameters to cfg80211_get_bss() should be of the enum ieee80211_bss_type resp. enum ieee80211_privacy types, which WLAN_CAPABILITY_ESS very much is not. Fix both cfg80211_get_bss() calls in ioctl_cfg80211.c to pass the right parameters. Note that the second call was already somewhat fixed by commenting out WLAN_CAPABILITY_ESS and passing in 0 instead. This was still not entirely correct though since that would limit returned BSS-es to ESS type BSS-es with privacy on. Cc: stable@vger.kernel.org Signed-off-by: Hans de Goede Link: https://lore.kernel.org/r/20230306153512.162104-2-hdegoede@redhat.com Signed-off-by: Greg Kroah-Hartman diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c index 3aba4e6eec8a..84a9f4dd8f95 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -350,7 +350,7 @@ int rtw_cfg80211_check_bss(struct adapter *padapter) bss = cfg80211_get_bss(padapter->rtw_wdev->wiphy, notify_channel, pnetwork->mac_address, pnetwork->ssid.ssid, pnetwork->ssid.ssid_length, - WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS); + IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY); cfg80211_put_bss(padapter->rtw_wdev->wiphy, bss); @@ -1139,8 +1139,8 @@ void rtw_cfg80211_unlink_bss(struct adapter *padapter, struct wlan_network *pnet bss = cfg80211_get_bss(wiphy, NULL/*notify_channel*/, select_network->mac_address, select_network->ssid.ssid, - select_network->ssid.ssid_length, 0/*WLAN_CAPABILITY_ESS*/, - 0/*WLAN_CAPABILITY_ESS*/); + select_network->ssid.ssid_length, IEEE80211_BSS_TYPE_ANY, + IEEE80211_PRIVACY_ANY); if (bss) { cfg80211_unlink_bss(wiphy, bss);