From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 336113D7D92 for ; Mon, 1 Jun 2026 15:03:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780326189; cv=none; b=bPcYf61up8W5CrSAxPDr7EAF6hm70q7Vxnzv0PohTC+Pa7sjnLSrT1j+aNLRsZM4u+R7uecrYdd9lQPpG7JE+ZAnyjH4BcKYARQSZoMaDf/Vxewbm3APjZq6J4DY+Sax1kC8+6Hptu9QeGpgkpqRAvLSfO7mzkKO2GdIjQCliUY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780326189; c=relaxed/simple; bh=y3nXG3eiOkUmg7AKLA6Dr3ur/NCCZUQyksbfrbKl3ao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jThOkvpnmgest36m3DVLv9Ml9ePjwCg9cPXpvypCwMC/zIcacn2aKxNOhjAJNZu3IwXxf4TG+7BBnEqdJj65YqB78bGr8CAqRl/Y+kxAZziTXwT2+YbrsL5qL1y1JG6uPRbhsXkaZo56TLwqy18ftuCxcYB2Q8fsVyVVjaSzNwA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=apL804qG; arc=none smtp.client-ip=209.85.218.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="apL804qG" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-beb1bee8c16so262950966b.0 for ; Mon, 01 Jun 2026 08:03:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780326186; x=1780930986; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6XOxlvGrDIh/S+bXFC23w8Qd0o21aZIUvcPpkR2Pbl4=; b=apL804qGwSEjIvhqaMSNmrbnp4KG9uak/cm4m7Bxmi2uSDFUJsDic5JV4xEZ37aKe8 gpcGL5bD2AsrAB71vmvyoEv18ndL6cm4FvHeKbnbabF5zoi5hSyhfMZnrBc9NGW7Ip4S TURv0KtQI9arpDmLV3kys02jg8LzBcAyimP5AWhnojRCV8wSGFNxWxGMHziSRMSdXVmL h/7SiwLzoRNjwqmGpMBJVjXvoXb089zarqA/bOcZ92x8vcyWaLf9MD7hWHi0JZM8j3DT d3EELRGRkN9Kb7r5k8ZLiUjx1zm2mEVVCshBtnBajNZxiRRlGmcnfBzOhLkd3AER3YTU a71w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780326186; x=1780930986; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=6XOxlvGrDIh/S+bXFC23w8Qd0o21aZIUvcPpkR2Pbl4=; b=E4TWUOuNAaaO0wgJC0yimdMzwJISSq2ck3NtnOzFcKtDmT9NTlEi0v1R5auKK5zNC0 GCsLR+D7s5YVYG3LOeg+PFrX/DTN0xGDZrhtGGxRVavRKhpwFyQ2FGX1/YgCXMBIrR5u B9A1mi10WtTewikHYQQlGc6VHbN5UtlvBl06ueqaraQdRnbf/gYRL75vQxCIBvRJ0Hu2 35fbm9cgaY6MNj1do9qXqboQ3d/Q17SYhoIPMNMtMBynxBuuW3DHxdkdcZBB78mPul80 1Wf+IUi7xVxa1DzFbl2M2hYBB7HuZzEFpulGxKuj4bg6EYHTBvkSEMq++T4yIh0vicmE Fv1w== X-Forwarded-Encrypted: i=1; AFNElJ9IPRM0THGfRDQd10l6O8kZaNGvq8yCXXCIFXeTws7Z9DDP/06hsl8j/AMpn8RXVKn1NTXIAOEYHR0g1jk=@vger.kernel.org X-Gm-Message-State: AOJu0Ywb/sJoEIBKAv47sTlDRES60RGZmx9FsXR1Arz+TATwIRZsPEK0 M/aJrrCjMfUSM75wwQ4k3rPJAODCHE2s590WF9vKAF7dqcORZj5ZjT7z X-Gm-Gg: Acq92OHKRUdpnqC4BpvRpRWs497J2phFDPq5ln8xxGuQI/IUeihfFKukYowIvWJUQSV RW6msb+mGvGZfbN13sY7q3HwU0rO6qdKpznh9HCZNFUb9VOzxyzWV/CMjd81JroCFK2+RE+ixeW pRolTgYm7RDwFKdMANmqEwcTmzNlXZB7kGMZmXb5Qo5wDvttug4Wv9wkuokYFvdWPjH7xOmrpA2 71Xushztx9p0XhOFexxNxxUJmwLM5NmUS4j3wXPq3cdOLb3yE6VcrSu708kFj3AbzVI2AJ3to8q +d3uIK219uEvFcsRABtDdfkctPEVuhCY8+D7BSb6w37y5PloxMamt4ceYOhoR6ZfnzWsxx8EP8j 8PEpmj/zRCCbzfPnxRuzzhn9mQvubZVMm/5fCKN4ZuivkYvE2NLNPu7Sm8GRwOnEFynWBqCiNKd I+Vl1O2475F1fKjO3IHBQ+FtviOcozQB+NZwpqwvYXsv9K X-Received: by 2002:a17:907:1ca0:b0:bee:7c9b:fbd1 with SMTP id a640c23a62f3a-bee7c9c0ff8mr90468966b.1.1780326186061; Mon, 01 Jun 2026 08:03:06 -0700 (PDT) Received: from archlinux ([185.140.161.214]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-bec1642a049sm189607466b.61.2026.06.01.08.03.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2026 08:03:05 -0700 (PDT) From: Nikolay Kulikov To: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nikolay Kulikov Subject: [PATCH 2/2] staging: rtl8723bs: remove unused 'oui' parameter from update_beacon() Date: Mon, 1 Jun 2026 18:01:24 +0300 Message-ID: <20260601150253.69930-3-nikolayof23@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260601150253.69930-1-nikolayof23@gmail.com> References: <20260601150253.69930-1-nikolayof23@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit After deleting one of the switch-case branches, this parameter became unused, so remove it. Signed-off-by: Nikolay Kulikov --- drivers/staging/rtl8723bs/core/rtw_ap.c | 32 +++++++++++----------- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 4 +-- drivers/staging/rtl8723bs/core/rtw_xmit.c | 8 +++--- drivers/staging/rtl8723bs/include/rtw_ap.h | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c index 316f879923f5..febeb66469f5 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -232,7 +232,7 @@ void expire_timeout_chk(struct adapter *padapter) /* to update bcn with tim_bitmap for this station */ pstapriv->tim_bitmap |= BIT(psta->aid); - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); if (!pmlmeext->active_keep_alive_check) continue; @@ -739,7 +739,7 @@ void start_bss_network(struct adapter *padapter) rtw_get_capability((struct wlan_bssid_ex *)pnetwork)); if (pmlmeext->bstart_bss) { - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); /* issue beacon frame */ send_beacon(padapter); @@ -1336,7 +1336,7 @@ static void update_bcn_rsn_ie(struct adapter *padapter) { } -void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx) +void update_beacon(struct adapter *padapter, u8 ie_id, u8 tx) { struct mlme_priv *pmlmepriv; struct mlme_ext_priv *pmlmeext; @@ -1513,7 +1513,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && (pmlmepriv->num_sta_no_short_preamble == 1)) { beacon_updated = true; - update_beacon(padapter, 0xFF, NULL, true); + update_beacon(padapter, 0xFF, true); } } } else { @@ -1525,7 +1525,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && (pmlmepriv->num_sta_no_short_preamble == 0)) { beacon_updated = true; - update_beacon(padapter, 0xFF, NULL, true); + update_beacon(padapter, 0xFF, true); } } } @@ -1538,7 +1538,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) if (pmlmepriv->num_sta_non_erp == 1) { beacon_updated = true; - update_beacon(padapter, WLAN_EID_ERP_INFO, NULL, true); + update_beacon(padapter, WLAN_EID_ERP_INFO, true); } } } else { @@ -1549,7 +1549,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) if (pmlmepriv->num_sta_non_erp == 0) { beacon_updated = true; - update_beacon(padapter, WLAN_EID_ERP_INFO, NULL, true); + update_beacon(padapter, WLAN_EID_ERP_INFO, true); } } } @@ -1563,7 +1563,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && (pmlmepriv->num_sta_no_short_slot_time == 1)) { beacon_updated = true; - update_beacon(padapter, 0xFF, NULL, true); + update_beacon(padapter, 0xFF, true); } } } else { @@ -1575,7 +1575,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && (pmlmepriv->num_sta_no_short_slot_time == 0)) { beacon_updated = true; - update_beacon(padapter, 0xFF, NULL, true); + update_beacon(padapter, 0xFF, true); } } } @@ -1610,8 +1610,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) } if (rtw_ht_operation_update(padapter) > 0) { - update_beacon(padapter, WLAN_EID_HT_CAPABILITY, NULL, false); - update_beacon(padapter, WLAN_EID_HT_OPERATION, NULL, true); + update_beacon(padapter, WLAN_EID_HT_CAPABILITY, false); + update_beacon(padapter, WLAN_EID_HT_OPERATION, true); } /* update associated stations cap. */ @@ -1633,7 +1633,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) if (pmlmeext->cur_wireless_mode > WIRELESS_11B && pmlmepriv->num_sta_no_short_preamble == 0){ beacon_updated = true; - update_beacon(padapter, 0xFF, NULL, true); + update_beacon(padapter, 0xFF, true); } } @@ -1642,7 +1642,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) pmlmepriv->num_sta_non_erp--; if (pmlmepriv->num_sta_non_erp == 0) { beacon_updated = true; - update_beacon(padapter, WLAN_EID_ERP_INFO, NULL, true); + update_beacon(padapter, WLAN_EID_ERP_INFO, true); } } @@ -1652,7 +1652,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) if (pmlmeext->cur_wireless_mode > WIRELESS_11B && pmlmepriv->num_sta_no_short_slot_time == 0){ beacon_updated = true; - update_beacon(padapter, 0xFF, NULL, true); + update_beacon(padapter, 0xFF, true); } } @@ -1672,8 +1672,8 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) } if (rtw_ht_operation_update(padapter) > 0) { - update_beacon(padapter, WLAN_EID_HT_CAPABILITY, NULL, false); - update_beacon(padapter, WLAN_EID_HT_OPERATION, NULL, true); + update_beacon(padapter, WLAN_EID_HT_CAPABILITY, false); + update_beacon(padapter, WLAN_EID_HT_OPERATION, true); } return beacon_updated; diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c index b932670f5d63..f182b10b0f45 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -1526,7 +1526,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter) pstapriv->sta_dz_bitmap &= ~BIT(0); if (update_tim) - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); } else {/* re check again */ rtw_chk_hi_queue_cmd(padapter); } diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c index 86c5e2c4e7dd..a75231c55310 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -1009,7 +1009,7 @@ static signed int validate_recv_ctrl_frame(struct adapter *padapter, union recv_ /* update BCN for TIM IE */ /* update_BCNTIM(padapter); */ - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); } /* spin_unlock_bh(&psta->sleep_q.lock); */ @@ -1031,7 +1031,7 @@ static signed int validate_recv_ctrl_frame(struct adapter *padapter, union recv_ /* update BCN for TIM IE */ /* update_BCNTIM(padapter); */ - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); } } } diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index 444966c0de7f..23136d985e7c 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -2083,7 +2083,7 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct x pstapriv->sta_dz_bitmap |= BIT(0); if (update_tim) - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); else chk_bmc_sleepq_cmd(padapter); @@ -2138,7 +2138,7 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct x if (update_tim) /* update BCN for TIM IE */ - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); } ret = true; @@ -2333,7 +2333,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) spin_unlock_bh(&pxmitpriv->lock); if (update_mask) - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); } void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *psta) @@ -2393,7 +2393,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst if ((psta->sleepq_ac_len == 0) && (!psta->has_legacy_ac) && (wmmps_ac)) { pstapriv->tim_bitmap &= ~BIT(psta->aid); - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); } } diff --git a/drivers/staging/rtl8723bs/include/rtw_ap.h b/drivers/staging/rtl8723bs/include/rtw_ap.h index 83e835eb6513..866aa8386931 100644 --- a/drivers/staging/rtl8723bs/include/rtw_ap.h +++ b/drivers/staging/rtl8723bs/include/rtw_ap.h @@ -10,7 +10,7 @@ void init_mlme_ap_info(struct adapter *padapter); void free_mlme_ap_info(struct adapter *padapter); /* void update_BCNTIM(struct adapter *padapter); */ -void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx); +void update_beacon(struct adapter *padapter, u8 ie_id, u8 tx); void add_ratid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level); void expire_timeout_chk(struct adapter *padapter); void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta); -- 2.54.0