staging: rtl8723au: Declare rtw_alloc_xmitframe() static

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c
index 470d868f0f5c4a02dca7656ca8252fbd4754aad2..c59f306a9efd19ce1a87517d1afe0ad3868d4cb6 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723au/core/rtw_xmit.c
@@ -1515,14 +1515,8 @@ Otherwise, we must use _enter/_exit critical to protect free_xmit_queue...
 Must be very very cautious...
 
 */
-struct xmit_frame *rtw_alloc_xmitframe23a(struct xmit_priv *pxmitpriv)/* _queue *pfree_xmit_queue) */
+static struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)
 {
-       /*
-               Please remember to use all the osdep_service api,
-               and lock/unlock or _enter/_exit critical to protect
-               pfree_xmit_queue
-       */
-
        struct xmit_frame *pxframe = NULL;
        struct list_head *plist, *phead;
        struct rtw_queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
@@ -1530,7 +1524,9 @@ struct xmit_frame *rtw_alloc_xmitframe23a(struct xmit_priv *pxmitpriv)/* _queue
        spin_lock_bh(&pfree_xmit_queue->lock);
 
        if (_rtw_queue_empty23a(pfree_xmit_queue) == true) {
-               RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_alloc_xmitframe23a:%d\n", pxmitpriv->free_xmitframe_cnt));
+               RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,
+                        ("rtw_alloc_xmitframe:%d\n",
+                         pxmitpriv->free_xmitframe_cnt));
                pxframe =  NULL;
        } else {
                phead = get_list_head(pfree_xmit_queue);
@@ -1541,7 +1537,9 @@ struct xmit_frame *rtw_alloc_xmitframe23a(struct xmit_priv *pxmitpriv)/* _queue
 
                list_del_init(&pxframe->list);
                pxmitpriv->free_xmitframe_cnt--;
-               RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_alloc_xmitframe23a():free_xmitframe_cnt =%d\n", pxmitpriv->free_xmitframe_cnt));
+               RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,
+                        ("rtw_alloc_xmitframe():free_xmitframe_cnt =%d\n",
+                         pxmitpriv->free_xmitframe_cnt));
        }
 
        spin_unlock_bh(&pfree_xmit_queue->lock);
@@ -1947,7 +1945,7 @@ int rtw_xmit23a(struct rtw_adapter *padapter, struct sk_buff *skb)
        struct xmit_frame *pxmitframe = NULL;
        s32 res;
 
-       pxmitframe = rtw_alloc_xmitframe23a(pxmitpriv);
+       pxmitframe = rtw_alloc_xmitframe(pxmitpriv);
 
        if (pxmitframe == NULL) {
                RT_TRACE(_module_xmit_osdep_c_, _drv_err_,

diff --git a/drivers/staging/rtl8723au/include/rtw_xmit.h b/drivers/staging/rtl8723au/include/rtw_xmit.h
index 5b879764518f1c82180bf0b130558c5be8649d11..ca516623a2babb03168dce50f43f36563ad2ec2b 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_xmit.h
+++ b/drivers/staging/rtl8723au/include/rtw_xmit.h
@@ -357,7 +357,6 @@ void rtw_update_protection23a(struct rtw_adapter *padapter, u8 *ie, uint ie_len)
 s32 rtw_make_wlanhdr23a(struct rtw_adapter *padapter, u8 *hdr,
                     struct pkt_attrib *pattrib);
 s32 rtw_put_snap23a(u8 *data, u16 h_proto);
-struct xmit_frame *rtw_alloc_xmitframe23a(struct xmit_priv *pxmitpriv);
 struct xmit_frame *rtw_alloc_xmitframe23a_ext(struct xmit_priv *pxmitpriv);
 struct xmit_frame *rtw_alloc_xmitframe23a_once(struct xmit_priv *pxmitpriv);
 s32 rtw_free_xmitframe23a(struct xmit_priv *pxmitpriv,