staging: r8188eu: on_action_spct does nothing
authorMartin Kaiser <martin@kaiser.cx>
Thu, 21 Apr 2022 20:08:02 +0000 (22:08 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 22 Apr 2022 14:43:40 +0000 (16:43 +0200)
One of the entries in OnAction_tbl refers to on_action_spct. This function
reads some information but it performs no action. Remove on_action_spct
and its entry in OnAction_tbl.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220421200805.192083-3-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_mlme_ext.c
drivers/staging/r8188eu/include/ieee80211.h

index 2d52e9b..d185280 100644 (file)
@@ -33,7 +33,6 @@ static mlme_handler mlme_sta_tbl[] = {
 };
 
 static struct action_handler OnAction_tbl[] = {
-       {RTW_WLAN_CATEGORY_SPECTRUM_MGMT,        "ACTION_SPECTRUM_MGMT", on_action_spct},
        {RTW_WLAN_CATEGORY_QOS, "ACTION_QOS", &OnAction_qos},
        {RTW_WLAN_CATEGORY_DLS, "ACTION_DLS", &OnAction_dls},
        {RTW_WLAN_CATEGORY_BACK, "ACTION_BACK", &OnAction_back},
@@ -1476,42 +1475,6 @@ unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frame
        return _SUCCESS;
 }
 
-unsigned int on_action_spct(struct adapter *padapter, struct recv_frame *precv_frame)
-{
-       unsigned int ret = _FAIL;
-       struct sta_info *psta = NULL;
-       struct sta_priv *pstapriv = &padapter->stapriv;
-       u8 *pframe = precv_frame->rx_data;
-       u8 *frame_body = (u8 *)(pframe + sizeof(struct ieee80211_hdr_3addr));
-       u8 category;
-       u8 action;
-
-       psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
-
-       if (!psta)
-               goto exit;
-
-       category = frame_body[0];
-       if (category != RTW_WLAN_CATEGORY_SPECTRUM_MGMT)
-               goto exit;
-
-       action = frame_body[1];
-       switch (action) {
-       case RTW_WLAN_ACTION_SPCT_MSR_REQ:
-       case RTW_WLAN_ACTION_SPCT_MSR_RPRT:
-       case RTW_WLAN_ACTION_SPCT_TPC_REQ:
-       case RTW_WLAN_ACTION_SPCT_TPC_RPRT:
-               break;
-       case RTW_WLAN_ACTION_SPCT_CHL_SWITCH:
-               break;
-       default:
-               break;
-       }
-
-exit:
-       return ret;
-}
-
 unsigned int OnAction_qos(struct adapter *padapter, struct recv_frame *precv_frame)
 {
        return _SUCCESS;
index 81b16ca..69fdccf 100644 (file)
@@ -596,7 +596,6 @@ static inline int is_broadcast_mac_addr(const u8 *addr)
 
 /* Action category code */
 enum rtw_ieee80211_category {
-       RTW_WLAN_CATEGORY_SPECTRUM_MGMT = 0,
        RTW_WLAN_CATEGORY_QOS = 1,
        RTW_WLAN_CATEGORY_DLS = 2,
        RTW_WLAN_CATEGORY_BACK = 3,