staging: r8188eu: move rtw_indicate_sta_assoc_event() to rtw_ap.c

Move the function rtw_indicate_sta_assoc_event() to core/rtw_ap.c to
get one step closer to removing os_dep/mlme_linux.c.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220819125428.8412-5-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_ap.c b/drivers/staging/r8188eu/core/rtw_ap.c
index a567683c21fd061b8682aa4b73788f74ee8b5100..24eb8dce9bfeb042362098516c1db86b123e548a 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_ap.c
+++ b/drivers/staging/r8188eu/core/rtw_ap.c
@@ -935,6 +935,27 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)
        return beacon_updated;
 }
 
+void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_info *psta)
+{
+       union iwreq_data wrqu;
+       struct sta_priv *pstapriv = &padapter->stapriv;
+
+       if (!psta)
+               return;
+
+       if (psta->aid > NUM_STA)
+               return;
+
+       if (pstapriv->sta_aid[psta->aid - 1] != psta)
+               return;
+
+       wrqu.addr.sa_family = ARPHRD_ETHER;
+
+       memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN);
+
+       wireless_send_event(padapter->pnetdev, IWEVREGISTERED, &wrqu, NULL);
+}
+
 static void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *psta)
 {
        union iwreq_data wrqu;

diff --git a/drivers/staging/r8188eu/os_dep/mlme_linux.c b/drivers/staging/r8188eu/os_dep/mlme_linux.c
index ad5f795f6857ba80decde48b939b6632f58c19ea..37c7f52421eee395a53d80b55b5598e68db5affc 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/mlme_linux.c
+++ b/drivers/staging/r8188eu/os_dep/mlme_linux.c
@@ -129,24 +129,3 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)
                kfree(buff);
        }
 }
-
-void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_info *psta)
-{
-       union iwreq_data wrqu;
-       struct sta_priv *pstapriv = &padapter->stapriv;
-
-       if (!psta)
-               return;
-
-       if (psta->aid > NUM_STA)
-               return;
-
-       if (pstapriv->sta_aid[psta->aid - 1] != psta)
-               return;
-
-       wrqu.addr.sa_family = ARPHRD_ETHER;
-
-       memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN);
-
-       wireless_send_event(padapter->pnetdev, IWEVREGISTERED, &wrqu, NULL);
-}