staging: r8188eu: rename rtw_os_xmit_complete()

The function rtw_os_xmit_complete() was moved from the os_dep
directory. It looks like the driver was originaly written to support
different operating systems. Obviously we do not need an extra 'os'
in the function name that indicates that the function is operating
system specific. Rename it to rtw_xmit_complete().

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/20220820181623.12497-16-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 3103e8871dfd6b1ed6d2ef46884507133761a68d..893dac30e8e66fb31063b53151d3861fb98f136e 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -7876,7 +7876,7 @@ u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf)
 
                                spin_unlock_bh(&psta_bmc->sleep_q.lock);
                                if (rtl8188eu_hal_xmit(padapter, pxmitframe))
-                                       rtw_os_xmit_complete(padapter, pxmitframe);
+                                       rtw_xmit_complete(padapter, pxmitframe);
                                spin_lock_bh(&psta_bmc->sleep_q.lock);
                        }
                        spin_unlock_bh(&psta_bmc->sleep_q.lock);

diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index d5878b31bdbbea277f57c0824cef9dd8a9750f6c..760b115938f2034321fb1292b93a89dbf855ae59 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -229,7 +229,7 @@ exit:
        return res;
 }
 
-void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe)
+void rtw_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe)
 {
        if (pxframe->pkt)
                rtw_os_pkt_complete(padapter, pxframe->pkt);
@@ -249,7 +249,7 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv)
                return;
 
        for (i = 0; i < NR_XMITFRAME; i++) {
-               rtw_os_xmit_complete(padapter, pxmitframe);
+               rtw_xmit_complete(padapter, pxmitframe);
 
                pxmitframe++;
        }
@@ -2017,7 +2017,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
 
                spin_unlock_bh(&psta->sleep_q.lock);
                if (rtl8188eu_hal_xmit(padapter, pxmitframe))
-                       rtw_os_xmit_complete(padapter, pxmitframe);
+                       rtw_xmit_complete(padapter, pxmitframe);
                spin_lock_bh(&psta->sleep_q.lock);
        }
 
@@ -2067,7 +2067,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
 
                        spin_unlock_bh(&psta_bmc->sleep_q.lock);
                        if (rtl8188eu_hal_xmit(padapter, pxmitframe))
-                               rtw_os_xmit_complete(padapter, pxmitframe);
+                               rtw_xmit_complete(padapter, pxmitframe);
                        spin_lock_bh(&psta_bmc->sleep_q.lock);
                }
 
@@ -2141,7 +2141,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst
                pxmitframe->attrib.triggered = 1;
 
                if (rtl8188eu_hal_xmit(padapter, pxmitframe))
-                       rtw_os_xmit_complete(padapter, pxmitframe);
+                       rtw_xmit_complete(padapter, pxmitframe);
 
                if ((psta->sleepq_ac_len == 0) && (!psta->has_legacy_ac) && (wmmps_ac)) {
                        pstapriv->tim_bitmap &= ~BIT(psta->aid);

diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
index bdfa5194928976aeead1b80b20375ab8c5d0fff8..8e4a5acc0b18885d3c93d4d3664e8597c1760263 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
@@ -431,7 +431,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmit
        rtw_xmitframe_coalesce(adapt, pxmitframe->pkt, pxmitframe);
 
        /*  always return ndis_packet after rtw_xmitframe_coalesce */
-       rtw_os_xmit_complete(adapt, pxmitframe);
+       rtw_xmit_complete(adapt, pxmitframe);
 
        /* 3 2. aggregate same priority and same DA(AP or STA) frames */
        pfirstframe = pxmitframe;
@@ -501,7 +501,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmit
 
                rtw_xmitframe_coalesce(adapt, pxmitframe->pkt, pxmitframe);
                /*  always return ndis_packet after rtw_xmitframe_coalesce */
-               rtw_os_xmit_complete(adapt, pxmitframe);
+               rtw_xmit_complete(adapt, pxmitframe);
 
                /*  (len - TXDESC_SIZE) == pxmitframe->attrib.last_txcmdsz */
                update_txdesc(pxmitframe, pxmitframe->buf_addr, pxmitframe->attrib.last_txcmdsz, true);

diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h
index 0c46b19d284271bfa3cecb7671bd3917b87f2215..2475ca084265a76789a2adc60d5a7b5d3259d9d4 100644 (file)
--- a/drivers/staging/r8188eu/include/rtw_xmit.h
+++ b/drivers/staging/r8188eu/include/rtw_xmit.h
@@ -364,7 +364,7 @@ u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe);
 int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms);
 void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status);
 
-void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe);
+void rtw_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe);
 
 /* include after declaring struct xmit_buf, in order to avoid warning */
 #include "xmit_osdep.h"