staging: r8188eu: remove dummy entries from OnAction_tbl

Unlike mlme_sta_tbl, OnAction_tbl is an array of structs.

OnAction iterates over the array to find the entry for a specific action
category. No action is performed if a category has no entry.

We can remove the entries that point to the dummy function DoReserved.
These were the last users of DoReserved, the function itself can be
removed as well.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220421200805.192083-2-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 190de0b59c42f561859c9350ec34386ada7c6560..2d52e9b84786456e3e558eb43b618f07521f7cd4 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -38,10 +38,7 @@ static struct action_handler OnAction_tbl[] = {
        {RTW_WLAN_CATEGORY_DLS, "ACTION_DLS", &OnAction_dls},
        {RTW_WLAN_CATEGORY_BACK, "ACTION_BACK", &OnAction_back},
        {RTW_WLAN_CATEGORY_PUBLIC, "ACTION_PUBLIC", on_action_public},
-       {RTW_WLAN_CATEGORY_RADIO_MEASUREMENT, "ACTION_RADIO_MEASUREMENT", &DoReserved},
-       {RTW_WLAN_CATEGORY_FT, "ACTION_FT",     &DoReserved},
        {RTW_WLAN_CATEGORY_HT,  "ACTION_HT",    &OnAction_ht},
-       {RTW_WLAN_CATEGORY_SA_QUERY, "ACTION_SA_QUERY", &DoReserved},
        {RTW_WLAN_CATEGORY_WMM, "ACTION_WMM", &OnAction_wmm},
        {RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &OnAction_p2p},
 };
@@ -3959,11 +3956,6 @@ unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_frame)
        return _SUCCESS;
 }
 
-unsigned int DoReserved(struct adapter *padapter, struct recv_frame *precv_frame)
-{
-       return _SUCCESS;
-}
-
 struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv)
 {
        struct xmit_frame                       *pmgntframe;

diff --git a/drivers/staging/r8188eu/include/ieee80211.h b/drivers/staging/r8188eu/include/ieee80211.h
index 0e37cd8974b5d45c2931f0ca97269f6deef18954..81b16ca93429c97a08dd85c4db043b5fe815fa93 100644 (file)
--- a/drivers/staging/r8188eu/include/ieee80211.h
+++ b/drivers/staging/r8188eu/include/ieee80211.h
@@ -601,10 +601,7 @@ enum rtw_ieee80211_category {
        RTW_WLAN_CATEGORY_DLS = 2,
        RTW_WLAN_CATEGORY_BACK = 3,
        RTW_WLAN_CATEGORY_PUBLIC = 4, /* IEEE 802.11 public action frames */
-       RTW_WLAN_CATEGORY_RADIO_MEASUREMENT  = 5,
-       RTW_WLAN_CATEGORY_FT = 6,
        RTW_WLAN_CATEGORY_HT = 7,
-       RTW_WLAN_CATEGORY_SA_QUERY = 8,
        RTW_WLAN_CATEGORY_TDLS = 12,
        RTW_WLAN_CATEGORY_WMM = 17,
        RTW_WLAN_CATEGORY_P2P = 0x7f,/* P2P action frames */