Re: [PATCH 1/2] staging:r8188eu: refactor OnAction(): use switch instead table lookup

[Greg Kroah-Hartman]

On Sun, Mar 28, 2021 at 07:33:23PM +0300, Ivan Safonov wrote:
> The switch is easier to read and refactor.

Your subject line is incorrect :(

[PATCH 1/2] staging:r8188eu: refactor OnAction(): use switch instead table lookup

[Ivan Safonov]

The switch is easier to read and refactor.

Signed-off-by: Ivan Safonov 
---
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 57 ---
 .../staging/rtl8188eu/include/rtw_mlme_ext.h  |  6 --
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c 
b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 50d3c3631be0..4d741737d671 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -3780,26 +3780,10 @@ static unsigned int DoReserved(struct adapter *padapter,
return _SUCCESS;
 }
 
-static struct action_handler OnAction_tbl[] = {
-   {RTW_WLAN_CATEGORY_SPECTRUM_MGMT,"ACTION_SPECTRUM_MGMT", 
on_action_spct},
-   {RTW_WLAN_CATEGORY_QOS, "ACTION_QOS", _qos},
-   {RTW_WLAN_CATEGORY_DLS, "ACTION_DLS", _dls},
-   {RTW_WLAN_CATEGORY_BACK, "ACTION_BACK", _back},
-   {RTW_WLAN_CATEGORY_PUBLIC, "ACTION_PUBLIC", on_action_public},
-   {RTW_WLAN_CATEGORY_RADIO_MEASUREMENT, "ACTION_RADIO_MEASUREMENT", 
},
-   {RTW_WLAN_CATEGORY_FT, "ACTION_FT", },
-   {RTW_WLAN_CATEGORY_HT,  "ACTION_HT",_ht},
-   {RTW_WLAN_CATEGORY_SA_QUERY, "ACTION_SA_QUERY", },
-   {RTW_WLAN_CATEGORY_WMM, "ACTION_WMM", _wmm},
-   {RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", _p2p},
-};
-
 static unsigned int OnAction(struct adapter *padapter,
 struct recv_frame *precv_frame)
 {
-   int i;
unsigned char category;
-   struct action_handler *ptable;
unsigned char *frame_body;
u8 *pframe = precv_frame->pkt->data;
 
@@ -3807,11 +3791,44 @@ static unsigned int OnAction(struct adapter *padapter,
 
category = frame_body[0];
 
-   for (i = 0; i < ARRAY_SIZE(OnAction_tbl); i++) {
-   ptable = _tbl[i];
-   if (category == ptable->num)
-   ptable->func(padapter, precv_frame);
+   switch (category) {
+   case RTW_WLAN_CATEGORY_SPECTRUM_MGMT:
+   on_action_spct(padapter, precv_frame);
+   break;
+   case RTW_WLAN_CATEGORY_QOS:
+   OnAction_qos(padapter, precv_frame);
+   break;
+   case RTW_WLAN_CATEGORY_DLS:
+   OnAction_dls(padapter, precv_frame);
+   break;
+   case RTW_WLAN_CATEGORY_BACK:
+   OnAction_back(padapter, precv_frame);
+   break;
+   case RTW_WLAN_CATEGORY_PUBLIC:
+   on_action_public(padapter, precv_frame);
+   break;
+   case RTW_WLAN_CATEGORY_RADIO_MEASUREMENT:
+   DoReserved(padapter, precv_frame);
+   break;
+   case RTW_WLAN_CATEGORY_FT:
+   DoReserved(padapter, precv_frame);
+   break;
+   case RTW_WLAN_CATEGORY_HT:
+   OnAction_ht(padapter, precv_frame);
+   break;
+   case RTW_WLAN_CATEGORY_SA_QUERY:
+   DoReserved(padapter, precv_frame);
+   break;
+   case RTW_WLAN_CATEGORY_WMM:
+   OnAction_wmm(padapter, precv_frame);
+   break;
+   case RTW_WLAN_CATEGORY_P2P:
+   OnAction_p2p(padapter, precv_frame);
+   break;
+   default:
+   break;
}
+
return _SUCCESS;
 }
 
diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h 
b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
index b11a6886a083..aa733abad10c 100644
--- a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
@@ -227,12 +227,6 @@ struct mlme_handler {
unsigned int (*func)(struct adapter *adapt, struct recv_frame *frame);
 };
 
-struct action_handler {
-   unsigned int num;
-   const char *str;
-   unsigned int (*func)(struct adapter *adapt, struct recv_frame *frame);
-};
-
 struct ss_res {
int state;
int bss_cnt;
-- 
2.26.2