staging: r8188eu: remove rtw_ies_remove_ie()

Function rtw_ies_remove_ie() is not used, remove it. It is the only
user of rtw_get_ie_ex(), remove that function as well.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210922200420.9693-38-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_ieee80211.c b/drivers/staging/r8188eu/core/rtw_ieee80211.c
index bc7ab84c0e0512a9d1d2c685a42f9a3327124a54..b2a376867c54697acb9e8192cb5addbc5b695b82 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/r8188eu/core/rtw_ieee80211.c
@@ -201,96 +201,6 @@ u8 *rtw_get_ie(u8 *pbuf, int index, int *len, int limit)
        return NULL;
 }
 
-/**
- * rtw_get_ie_ex - Search specific IE from a series of IEs
- * @in_ie: Address of IEs to search
- * @in_len: Length limit from in_ie
- * @eid: Element ID to match
- * @oui: OUI to match
- * @oui_len: OUI length
- * @ie: If not NULL and the specific IE is found, the IE will be copied to the buf starting from the specific IE
- * @ielen: If not NULL and the specific IE is found, will set to the length of the entire IE
- *
- * Returns: The address of the specific IE found, or NULL
- */
-u8 *rtw_get_ie_ex(u8 *in_ie, uint in_len, u8 eid, u8 *oui, u8 oui_len, u8 *ie, uint *ielen)
-{
-       uint cnt;
-       u8 *target_ie = NULL;
-
-       if (ielen)
-               *ielen = 0;
-
-       if (!in_ie || in_len <= 0)
-               return target_ie;
-
-       cnt = 0;
-
-       while (cnt < in_len) {
-               if (eid == in_ie[cnt] && (!oui || !memcmp(&in_ie[cnt + 2], oui, oui_len))) {
-                       target_ie = &in_ie[cnt];
-
-                       if (ie)
-                               memcpy(ie, &in_ie[cnt], in_ie[cnt + 1] + 2);
-
-                       if (ielen)
-                               *ielen = in_ie[cnt + 1] + 2;
-
-                       break;
-               } else {
-                       cnt += in_ie[cnt + 1] + 2; /* goto next */
-               }
-       }
-       return target_ie;
-}
-
-/**
- * rtw_ies_remove_ie - Find matching IEs and remove
- * @ies: Address of IEs to search
- * @ies_len: Pointer of length of ies, will update to new length
- * @offset: The offset to start scarch
- * @eid: Element ID to match
- * @oui: OUI to match
- * @oui_len: OUI length
- *
- * Returns: _SUCCESS: ies is updated, _FAIL: not updated
- */
-int rtw_ies_remove_ie(u8 *ies, uint *ies_len, uint offset, u8 eid, u8 *oui, u8 oui_len)
-{
-       int ret = _FAIL;
-       u8 *target_ie;
-       u32 target_ielen;
-       u8 *start;
-       uint search_len;
-
-       if (!ies || !ies_len || *ies_len <= offset)
-               goto exit;
-
-       start = ies + offset;
-       search_len = *ies_len - offset;
-
-       while (1) {
-               target_ie = rtw_get_ie_ex(start, search_len, eid, oui, oui_len, NULL, &target_ielen);
-               if (target_ie && target_ielen) {
-                       u8 buf[MAX_IE_SZ] = {0};
-                       u8 *remain_ies = target_ie + target_ielen;
-                       uint remain_len = search_len - (remain_ies - start);
-
-                       memcpy(buf, remain_ies, remain_len);
-                       memcpy(target_ie, buf, remain_len);
-                       *ies_len = *ies_len - target_ielen;
-                       ret = _SUCCESS;
-
-                       start = target_ie;
-                       search_len = remain_len;
-               } else {
-                       break;
-               }
-       }
-exit:
-       return ret;
-}
-
 void rtw_set_supported_rate(u8 *SupportedRates, uint mode)
 {
 

diff --git a/drivers/staging/r8188eu/include/ieee80211.h b/drivers/staging/r8188eu/include/ieee80211.h
index 36c95adb9d8545c9a0aa4130d50d51e5952ead11..65e21d5d5b466daae182756da9f8ea3cd3848505 100644 (file)
--- a/drivers/staging/r8188eu/include/ieee80211.h
+++ b/drivers/staging/r8188eu/include/ieee80211.h
@@ -1103,10 +1103,6 @@ u8 *rtw_set_ie_mesh_ch_switch_parm(u8 *buf, u32 *buf_len, u8 ttl,
                                   u8 flags, u16 reason, u16 precedence);
 
 u8 *rtw_get_ie(u8 *pbuf, int index, int *len, int limit);
-u8 *rtw_get_ie_ex(u8 *in_ie, uint in_len, u8 eid, u8 *oui,
-                 u8 oui_len, u8 *ie, uint *ielen);
-int rtw_ies_remove_ie(u8 *ies, uint *ies_len, uint offset,
-                     u8 eid, u8 *oui, u8 oui_len);
 
 void rtw_set_supported_rate(u8 *SupportedRates, uint mode);