Skip to contentSkip to conversation

staging: r8188eu: remove unused function rtw_add_bcn_ie()

PATCH In review Michael Straube 2 participants 4 messages Aug 19, 2021 – Aug 20, 2021 Staging

lore
Share & tools
lore

Michael Straube

author
#0 lore raw

PATCH 1/2 staging: r8188eu: remove unused function rtw_add_bcn_ie()

Function rtw_add_bcn_ie() is not used anywhere, remove it.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/r8188eu/core/rtw_ap.c    | 63 ------------------------
 drivers/staging/r8188eu/include/rtw_ap.h |  2 -
 2 files changed, 65 deletions(-)
drivers/staging/r8188eu/core/rtw_ap.c +0 -63
index 1127e9a52458..0237b7f8e42f 100644
@@ -139,69 +139,6 @@ static void update_BCNTIM(struct adapter *padapter)
 	set_tx_beacon_cmd(padapter);
 }
 
-void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index, u8 *data, u8 len)
-{
-	struct ndis_802_11_var_ie *pIE;
-	u8 bmatch = false;
-	u8 *pie = pnetwork->IEs;
-	u8 *p = NULL, *dst_ie = NULL, *premainder_ie = NULL;
-	u8 *pbackup_remainder_ie = NULL;
-	u32 i, offset, ielen = 0, ie_offset, remainder_ielen = 0;
-
-	for (i = sizeof(struct ndis_802_11_fixed_ie); i < pnetwork->IELength;) {
-		pIE = (struct ndis_802_11_var_ie *)(pnetwork->IEs + i);
-
-		if (pIE->ElementID > index) {
-			break;
-		} else if (pIE->ElementID == index) { /*  already exist the same IE */
-			p = (u8 *)pIE;
-			ielen = pIE->Length;
-			bmatch = true;
-			break;
-		}
-		p = (u8 *)pIE;
-		ielen = pIE->Length;
-		i += (pIE->Length + 2);
-	}
-
-	if (p && ielen > 0) {
-		ielen += 2;
-
-		premainder_ie = p + ielen;
-
-		ie_offset = (int)(p - pie);
-
-		remainder_ielen = pnetwork->IELength - ie_offset - ielen;
-
-		if (bmatch)
-			dst_ie = p;
-		else
-			dst_ie = (p + ielen);
-	}
-
-	if (remainder_ielen > 0) {
-		pbackup_remainder_ie = kmalloc(remainder_ielen, GFP_KERNEL);
-		if (pbackup_remainder_ie && premainder_ie)
-			memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
-	}
-
-	*dst_ie++ = index;
-	*dst_ie++ = len;
-
-	memcpy(dst_ie, data, len);
-	dst_ie += len;
-
-	/* copy remainder IE */
-	if (pbackup_remainder_ie) {
-		memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen);
-
-		kfree(pbackup_remainder_ie);
-	}
-
-	offset =  (uint)(dst_ie - pie);
-	pnetwork->IELength = offset + remainder_ielen;
-}
-
 void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index)
 {
 	u8 *p, *dst_ie = NULL, *premainder_ie = NULL;
drivers/staging/r8188eu/include/rtw_ap.h +0 -2
index b20edab3bb00..fffb6794b1ce 100644
@@ -16,8 +16,6 @@ void rtw_indicate_sta_disassoc_event(struct adapter *padapter,
 				     struct sta_info *psta);
 void init_mlme_ap_info(struct adapter *padapter);
 void free_mlme_ap_info(struct adapter *padapter);
-void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork,
-		    u8 index, u8 *data, u8 len);
 void rtw_remove_bcn_ie(struct adapter *padapter,
 		       struct wlan_bssid_ex *pnetwork, u8 index);
 void update_beacon(struct adapter *padapter, u8 ie_id,
Signature · 1 line
2.32.0
author
#1 lore raw

PATCH 2/2 staging: r8188eu: remove unused function rtw_remove_bcn_ie()

Function rtw_remove_bcn_ie() is not used anywhere, remove it.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/r8188eu/core/rtw_ap.c    | 38 ------------------------
 drivers/staging/r8188eu/include/rtw_ap.h |  2 --
 2 files changed, 40 deletions(-)
drivers/staging/r8188eu/core/rtw_ap.c +0 -38
index 0237b7f8e42f..1f3aa0092ef9 100644
@@ -139,44 +139,6 @@ static void update_BCNTIM(struct adapter *padapter)
 	set_tx_beacon_cmd(padapter);
 }
 
-void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index)
-{
-	u8 *p, *dst_ie = NULL, *premainder_ie = NULL;
-	u8 *pbackup_remainder_ie = NULL;
-	uint offset, ielen, ie_offset, remainder_ielen = 0;
-	u8	*pie = pnetwork->IEs;
-
-	p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, index, &ielen,
-		       pnetwork->IELength - _FIXED_IE_LENGTH_);
-	if (p && ielen > 0) {
-		ielen += 2;
-
-		premainder_ie = p + ielen;
-
-		ie_offset = (int)(p - pie);
-
-		remainder_ielen = pnetwork->IELength - ie_offset - ielen;
-
-		dst_ie = p;
-	}
-
-	if (remainder_ielen > 0) {
-		pbackup_remainder_ie = kmalloc(remainder_ielen, GFP_KERNEL);
-		if (pbackup_remainder_ie && premainder_ie)
-			memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
-	}
-
-	/* copy remainder IE */
-	if (pbackup_remainder_ie) {
-		memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen);
-
-		kfree(pbackup_remainder_ie);
-	}
-
-	offset =  (uint)(dst_ie - pie);
-	pnetwork->IELength = offset + remainder_ielen;
-}
-
 static u8 chk_sta_is_alive(struct sta_info *psta)
 {
 	u8 ret = false;
drivers/staging/r8188eu/include/rtw_ap.h +0 -2
index fffb6794b1ce..2eb556968509 100644
@@ -16,8 +16,6 @@ void rtw_indicate_sta_disassoc_event(struct adapter *padapter,
 				     struct sta_info *psta);
 void init_mlme_ap_info(struct adapter *padapter);
 void free_mlme_ap_info(struct adapter *padapter);
-void rtw_remove_bcn_ie(struct adapter *padapter,
-		       struct wlan_bssid_ex *pnetwork, u8 index);
 void update_beacon(struct adapter *padapter, u8 ie_id,
 		   u8 *oui, u8 tx);
 void add_RATid(struct adapter *padapter, struct sta_info *psta,
Signature · 1 line
2.32.0
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] staging: r8188eu: remove unused function rtw_remove_bcn_ie()

In reply to Michael Straube
Quoted 8 lines · Michael Straube

Function rtw_remove_bcn_ie() is not used anywhere, remove it.

Signed-off-by Michael Straube <[email protected]>

---
 drivers/staging/r8188eu/core/rtw_ap.c    | 38 ------------------------ drivers/staging/r8188eu/include/rtw_ap.h |  2 --

 2 files changed, 40 deletions(-)

Dear Michael,

Looks good, thanks.

Acked-by Phillip Potter <[email protected]>

Regards,
Phil