staging: rtl8723bs: move static array definition from header to .c file
authorFabio Aiuto <fabioaiuto83@gmail.com>
Sat, 24 Apr 2021 09:02:03 +0000 (11:02 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 May 2021 09:19:30 +0000 (11:19 +0200)
move static array definition from header to .c file.
This prepare removal of a conditional compile block
_RTW_MLME_EXT_C_.

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/665c9d33a97954508ca9257850a5690afcf0a9a9.1619254603.git.fabioaiuto83@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h

index 602d00f1e6df6405be683fbeae07ab3630625931..3a7a2dbac050d7f34a95c1511f74e2d522ba6abe 100644 (file)
@@ -6002,6 +6002,36 @@ exit:
        return res;
 }
 
+static struct fwevent wlanevents[] = {
+       {0, rtw_dummy_event_callback},  /*0*/
+       {0, NULL},
+       {0, NULL},
+       {0, NULL},
+       {0, NULL},
+       {0, NULL},
+       {0, NULL},
+       {0, NULL},
+       {0, &rtw_survey_event_callback},                /*8*/
+       {sizeof(struct surveydone_event), &rtw_surveydone_event_callback},      /*9*/
+
+       {0, &rtw_joinbss_event_callback},               /*10*/
+       {sizeof(struct stassoc_event), &rtw_stassoc_event_callback},
+       {sizeof(struct stadel_event), &rtw_stadel_event_callback},
+       {0, &rtw_atimdone_event_callback},
+       {0, rtw_dummy_event_callback},
+       {0, NULL},      /*15*/
+       {0, NULL},
+       {0, NULL},
+       {0, NULL},
+       {0, rtw_fwdbg_event_callback},
+       {0, NULL},       /*20*/
+       {0, NULL},
+       {0, NULL},
+       {0, &rtw_cpwm_event_callback},
+       {0, NULL},
+       {0, &rtw_wmm_event_callback},
+
+};
 
 u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
 {
index 472818c5fd8355f8319241f445c2b21fcb2bdcaa..0248b91b452597beb289b2b8f6d5774577beb060 100644 (file)
@@ -805,38 +805,6 @@ enum {
 
 #ifdef _RTW_MLME_EXT_C_
 
-static struct fwevent wlanevents[] =
-{
-       {0, rtw_dummy_event_callback},  /*0*/
-       {0, NULL},
-       {0, NULL},
-       {0, NULL},
-       {0, NULL},
-       {0, NULL},
-       {0, NULL},
-       {0, NULL},
-       {0, &rtw_survey_event_callback},                /*8*/
-       {sizeof(struct surveydone_event), &rtw_surveydone_event_callback},      /*9*/
-
-       {0, &rtw_joinbss_event_callback},               /*10*/
-       {sizeof(struct stassoc_event), &rtw_stassoc_event_callback},
-       {sizeof(struct stadel_event), &rtw_stadel_event_callback},
-       {0, &rtw_atimdone_event_callback},
-       {0, rtw_dummy_event_callback},
-       {0, NULL},      /*15*/
-       {0, NULL},
-       {0, NULL},
-       {0, NULL},
-       {0, rtw_fwdbg_event_callback},
-       {0, NULL},       /*20*/
-       {0, NULL},
-       {0, NULL},
-       {0, &rtw_cpwm_event_callback},
-       {0, NULL},
-       {0, &rtw_wmm_event_callback},
-
-};
-
 #endif/* _RTL8192C_CMD_C_ */
 
 #endif