OSDN Git Service

staging: r8188eu: merge _mgt_dispatcher into mgt_dispatcher
authorMartin Kaiser <martin@kaiser.cx>
Wed, 13 Apr 2022 20:07:40 +0000 (22:07 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 14 Apr 2022 07:07:34 +0000 (09:07 +0200)
All that the _mgt_dispatcher function does is to call a function from
a function pointer. It's not worth having a separate function for this.

Merge _mgt_dispatcher into mgt_dispatcher.

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

index 66dd063..ba071de 100644 (file)
@@ -390,19 +390,6 @@ void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext)
        }
 }
 
-static void _mgt_dispatcher(struct adapter *padapter, struct mlme_handler *ptable, struct recv_frame *precv_frame)
-{
-       u8 *pframe = precv_frame->rx_data;
-
-       if (ptable->func) {
-       /* receive the frames that ra(a1) is my address or ra(a1) is bc address. */
-               if (memcmp(GetAddr1Ptr(pframe), myid(&padapter->eeprompriv), ETH_ALEN) &&
-                   !is_broadcast_ether_addr(GetAddr1Ptr(pframe)))
-                       return;
-               ptable->func(padapter, precv_frame);
-       }
-}
-
 void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame)
 {
        int index;
@@ -442,7 +429,14 @@ void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame)
                else
                        ptable->func = &OnAuthClient;
        }
-       _mgt_dispatcher(padapter, ptable, precv_frame);
+
+       if (ptable->func) {
+       /* receive the frames that ra(a1) is my address or ra(a1) is bc address. */
+               if (memcmp(GetAddr1Ptr(pframe), myid(&padapter->eeprompriv), ETH_ALEN) &&
+                   !is_broadcast_ether_addr(GetAddr1Ptr(pframe)))
+                       return;
+               ptable->func(padapter, precv_frame);
+       }
 }
 
 static u32 p2p_listen_state_process(struct adapter *padapter, unsigned char *da)