From nobody Mon Jun 8 05:24:55 2026 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 739153D8906 for ; Mon, 1 Jun 2026 15:03:04 +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=1780326185; cv=none; b=YHllfWyi+fTZzDdJeTKDoTRwgs/rejY+8tUGulp3pXRyHtJqiS9P4v6+N2wabfM4urKUCUeCDozZltd4C7VkTt2T/ARJicGcv4HgoxyKXkbjD1soKwxrbZfFY/xT0odCd6Gv5nbpAA5SgqvigCPwdnhsYUTJjh+3psl/b2y1xbg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780326185; c=relaxed/simple; bh=+adKIxAZwmZ6+hjn6pwKLlTrWbw/SQApQgu1grRm+Jc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bNBlyjhmkb7qOAS66+eV/bCJABY6YqWbRkFn5VscACTMddeaoqd5yV/LG92JZNin7XuLT/NgJTje7kWSphEqGs2FoLNlIGCdhh8OG9qekCPPSKUQa5IjxOIascYAjEcCBSYRLsg9zKPSNjM8wzWnta2ngiQ+aFtR4vvUb4YH8tc= 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=MLdGkFw9; 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="MLdGkFw9" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-bebbc325000so199078466b.0 for ; Mon, 01 Jun 2026 08:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780326183; x=1780930983; 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=Zik6Tl9LCLzqEXXgs3iwGTVTHmwW7Mj9rb7ltjfp1Wg=; b=MLdGkFw9ZFL6es8+/KMDD+WaNNqTenEbVVfQSBf9DA5P5W1ScWbAm+WzoeOX685pI8 q3bMWNOkVNMeCkN5WEXcqXc43SV6WkxeC0N3k+EFUaAH3SSXdsK+9UV00NwucTEOaGUn rKVjWbGhxa5tDdedygxnuumoU1V4HmskDZpLoiYhVoYjJo0/W4VqEjiP6O/oVMzDoQ0T xtKPaRqCWnMhMIHZjF25YCZ6CSxgsmkPNG/KX178o1rGkEXqJ6FMinGlFSYDKcQ6A8LC 45mB4uV5xyTSz3yyjzRey0Ardcz3FSqndaSJg9U98/CysIahpyV+83kBle/TeokGwLA1 HVUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780326183; x=1780930983; 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=Zik6Tl9LCLzqEXXgs3iwGTVTHmwW7Mj9rb7ltjfp1Wg=; b=FqOhvbaDjicwINXiVLbpkKerGfnz/dEJr0461bs29o7tc1tOGI2A3cU9uQGmc1mJdh eJOVSihUqBIcXquwJW8em07MGPB0CW9BoxgQN0nBJTBIVwnk0RkO8osH911gn9UO3q7U CC7C511pJcI1yCHLTt1i5KDObiM1c5uQsCZtWwdvgELCJdkRUOF1t3rszrko03+ZtvNx 5ZJIAmeDZfhmjgNkeT3/acrUVvNjvTxZ/iiNZT765WNLO/rG54B6V4SIaWdsBwY2ndXv pBCq5BG1h3K2yPwirtilA02B2H456fi9SfAYPUgdcddvW30+jFJuEA9CIluYAHd2nfoL SFfg== X-Forwarded-Encrypted: i=1; AFNElJ/gfMfCMqD2hiwmLy9lXP+e3a9g2k4J72rz1iH2hJXUNLlRf/rov1XUAb1QjMyqDakTjs3yLHFSuTkgWBU=@vger.kernel.org X-Gm-Message-State: AOJu0Yx7ULdR4WEVWYa2RmYTb4K08R1OQjmCPvis0mcYOVzdg/3sA1PT Xe9lhPrY6cpCKZZiL5uwJJpXiNOdZtYwOVXO+uLGg18vNnlqTL+R8QKM X-Gm-Gg: Acq92OHz84xKRd37dvWv2mL6YameFZBfATG4rrOyEfEfsb1QZ1aLUrKOK5vx5MgPBjI QQwmveB3YVs3M2dhZjzfyVN4PkSRLO6MnrwgcEriXeelGoR+on1HBxxdDp0jnOf+d1Pn50jsZ37 CC0bIjboSsvDZakat7u16TZYB5f9IPITQADENzPLCG+zwU8pgv7r1KtXDWVxCDtg+ZZckKx2611 qZMkUj+KVLoiFWPPh3Lyhc4v7pEjPNPr/6SjYF6+hMGaTWWG9T6HTOBerFwTB9FrN590U7N0Ze/ nkcON6OTv5gopr+JpGTQGGfnfQ4YWmNRACBsqdcc5zrtPhRjBR6o3MtCjHrZMTj7WyXCB4R9LTR cMXNAFPKW0gpFu3BKKrYJU/gBuUn23STJ5eqfARxrqc1ykeouwvglXr0dqMNzv5zCle0NxMiAVx O/jIDLdkc6b8oGRMv3o/HwzXWf6P8Gt/nAtw== X-Received: by 2002:a17:907:9453:b0:bea:5cc7:95a4 with SMTP id a640c23a62f3a-beab03de8a1mr694214066b.0.1780326182532; Mon, 01 Jun 2026 08:03:02 -0700 (PDT) Received: from archlinux ([185.140.161.214]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-bec1642a049sm189607466b.61.2026.06.01.08.03.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2026 08:03:02 -0700 (PDT) From: Nikolay Kulikov To: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nikolay Kulikov Subject: [PATCH 1/2] staging: rtl8723bs: remove unused case from update_beacon() Date: Mon, 1 Jun 2026 18:01:23 +0300 Message-ID: <20260601150253.69930-2-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: quoted-printable Content-Type: text/plain; charset="utf-8" The update_beacon() function is never called with 'ie_id' equal to 'WLAN_EID_VENDOR_SPECIFIC', meaning this case branch will never be called, so remove it and several related functions. Removing this case branch also fixes a possible null pointer dereference in update_bcn_vendor_spec() if 'oui' is NULL, since its value is not checked in any way. Signed-off-by: Nikolay Kulikov Reviewed-by: Dan Carpenter --- drivers/staging/rtl8723bs/core/rtw_ap.c | 84 ------------------------- 1 file changed, 84 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8= 723bs/core/rtw_ap.c index 065850a9e894..316f879923f5 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -1336,84 +1336,6 @@ static void update_bcn_rsn_ie(struct adapter *padapt= er) { } =20 -static void update_bcn_wpa_ie(struct adapter *padapter) -{ -} - -static void update_bcn_wmm_ie(struct adapter *padapter) -{ -} - -static void update_bcn_wps_ie(struct adapter *padapter) -{ - u8 *pwps_ie =3D NULL; - u8 *pwps_ie_src; - u8 *premainder_ie; - u8 *pbackup_remainder_ie =3D NULL; - - unsigned int wps_ielen =3D 0, wps_offset, remainder_ielen; - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; - struct wlan_bssid_ex *pnetwork =3D &pmlmeinfo->network; - unsigned char *ie =3D pnetwork->ies; - u32 ielen =3D pnetwork->ie_length; - - pwps_ie =3D rtw_get_wps_ie(ie + _FIXED_IE_LENGTH_, - ielen - _FIXED_IE_LENGTH_, - NULL, - &wps_ielen); - - if (!pwps_ie || wps_ielen =3D=3D 0) - return; - - pwps_ie_src =3D pmlmepriv->wps_beacon_ie; - if (!pwps_ie_src) - return; - - wps_offset =3D (unsigned int)(pwps_ie - ie); - - premainder_ie =3D pwps_ie + wps_ielen; - - remainder_ielen =3D ielen - wps_offset - wps_ielen; - - if (remainder_ielen) - pbackup_remainder_ie =3D kmemdup(premainder_ie, remainder_ielen, GFP_ATO= MIC); - - wps_ielen =3D (unsigned int)pwps_ie_src[1];/* to get ie data len */ - if ((wps_offset + wps_ielen + 2 + remainder_ielen) <=3D MAX_IE_SZ) { - memcpy(pwps_ie, pwps_ie_src, wps_ielen + 2); - pwps_ie +=3D (wps_ielen + 2); - - if (pbackup_remainder_ie) - memcpy(pwps_ie, pbackup_remainder_ie, remainder_ielen); - - /* update ie_length */ - pnetwork->ie_length =3D wps_offset + (wps_ielen + 2) + remainder_ielen; - } - - kfree(pbackup_remainder_ie); -} - -static void update_bcn_p2p_ie(struct adapter *padapter) -{ -} - -static void update_bcn_vendor_spec_ie(struct adapter *padapter, u8 *oui) -{ - if (!memcmp(RTW_WPA_OUI, oui, 4)) - update_bcn_wpa_ie(padapter); - - else if (!memcmp(WMM_OUI, oui, 4)) - update_bcn_wmm_ie(padapter); - - else if (!memcmp(WPS_OUI, oui, 4)) - update_bcn_wps_ie(padapter); - - else if (!memcmp(P2P_OUI, oui, 4)) - update_bcn_p2p_ie(padapter); -} - void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx) { struct mlme_priv *pmlmepriv; @@ -1467,12 +1389,6 @@ void update_beacon(struct adapter *padapter, u8 ie_i= d, u8 *oui, u8 tx) =20 break; =20 - case WLAN_EID_VENDOR_SPECIFIC: - - update_bcn_vendor_spec_ie(padapter, oui); - - break; - default: break; } --=20 2.54.0 From nobody Mon Jun 8 05:24:55 2026 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: quoted-printable Content-Type: text/plain; charset="utf-8" After deleting one of the switch-case branches, this parameter became unused, so remove it. Signed-off-by: Nikolay Kulikov Reviewed-by: Dan Carpenter --- 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/rtl8= 723bs/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) =20 /* to update bcn with tim_bitmap for this station */ pstapriv->tim_bitmap |=3D BIT(psta->aid); - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); =20 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)); =20 if (pmlmeext->bstart_bss) { - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); =20 /* issue beacon frame */ send_beacon(padapter); @@ -1336,7 +1336,7 @@ static void update_bcn_rsn_ie(struct adapter *padapte= r) { } =20 -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 *padap= ter, struct sta_info *psta) if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && (pmlmepriv->num_sta_no_short_preamble =3D=3D 1)) { beacon_updated =3D 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 *padap= ter, struct sta_info *psta) if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && (pmlmepriv->num_sta_no_short_preamble =3D=3D 0)) { beacon_updated =3D 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 *padap= ter, struct sta_info *psta) =20 if (pmlmepriv->num_sta_non_erp =3D=3D 1) { beacon_updated =3D 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 *padap= ter, struct sta_info *psta) =20 if (pmlmepriv->num_sta_non_erp =3D=3D 0) { beacon_updated =3D 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 *padap= ter, struct sta_info *psta) if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && (pmlmepriv->num_sta_no_short_slot_time =3D=3D 1)) { beacon_updated =3D 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 *padap= ter, struct sta_info *psta) if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) && (pmlmepriv->num_sta_no_short_slot_time =3D=3D 0)) { beacon_updated =3D 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 *padap= ter, struct sta_info *psta) } =20 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); } =20 /* update associated stations cap. */ @@ -1633,7 +1633,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapt= er, struct sta_info *psta) if (pmlmeext->cur_wireless_mode > WIRELESS_11B && pmlmepriv->num_sta_no_short_preamble =3D=3D 0){ beacon_updated =3D true; - update_beacon(padapter, 0xFF, NULL, true); + update_beacon(padapter, 0xFF, true); } } =20 @@ -1642,7 +1642,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapt= er, struct sta_info *psta) pmlmepriv->num_sta_non_erp--; if (pmlmepriv->num_sta_non_erp =3D=3D 0) { beacon_updated =3D true; - update_beacon(padapter, WLAN_EID_ERP_INFO, NULL, true); + update_beacon(padapter, WLAN_EID_ERP_INFO, true); } } =20 @@ -1652,7 +1652,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapt= er, struct sta_info *psta) if (pmlmeext->cur_wireless_mode > WIRELESS_11B && pmlmepriv->num_sta_no_short_slot_time =3D=3D 0){ beacon_updated =3D true; - update_beacon(padapter, 0xFF, NULL, true); + update_beacon(padapter, 0xFF, true); } } =20 @@ -1672,8 +1672,8 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapt= er, struct sta_info *psta) } =20 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); } =20 return beacon_updated; diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/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 *pada= pter) pstapriv->sta_dz_bitmap &=3D ~BIT(0); =20 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/rt= l8723bs/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 ada= pter *padapter, union recv_ =20 /* update BCN for TIM IE */ /* update_BCNTIM(padapter); */ - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); } =20 /* spin_unlock_bh(&psta->sleep_q.lock); */ @@ -1031,7 +1031,7 @@ static signed int validate_recv_ctrl_frame(struct ada= pter *padapter, union recv_ =20 /* 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/rt= l8723bs/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 |=3D BIT(0); =20 if (update_tim) - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); else chk_bmc_sleepq_cmd(padapter); =20 @@ -2138,7 +2138,7 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct = adapter *padapter, struct x =20 if (update_tim) /* update BCN for TIM IE */ - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); } =20 ret =3D true; @@ -2333,7 +2333,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, str= uct sta_info *psta) spin_unlock_bh(&pxmitpriv->lock); =20 if (update_mask) - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); } =20 void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_inf= o *psta) @@ -2393,7 +2393,7 @@ void xmit_delivery_enabled_frames(struct adapter *pad= apter, struct sta_info *pst if ((psta->sleepq_ac_len =3D=3D 0) && (!psta->has_legacy_ac) && (wmmps_a= c)) { pstapriv->tim_bitmap &=3D ~BIT(psta->aid); =20 - update_beacon(padapter, WLAN_EID_TIM, NULL, true); + update_beacon(padapter, WLAN_EID_TIM, true); } } =20 diff --git a/drivers/staging/rtl8723bs/include/rtw_ap.h b/drivers/staging/r= tl8723bs/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_le= vel); void expire_timeout_chk(struct adapter *padapter); void update_sta_info_apmode(struct adapter *padapter, struct sta_info *pst= a); --=20 2.54.0