Commit 6042cbfd authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

staging: rtl8723au: Declare rtw_alloc_xmitframe() static

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 086f7a4d
...@@ -1515,14 +1515,8 @@ Otherwise, we must use _enter/_exit critical to protect free_xmit_queue... ...@@ -1515,14 +1515,8 @@ Otherwise, we must use _enter/_exit critical to protect free_xmit_queue...
Must be very very cautious... 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 xmit_frame *pxframe = NULL;
struct list_head *plist, *phead; struct list_head *plist, *phead;
struct rtw_queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue; 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 ...@@ -1530,7 +1524,9 @@ struct xmit_frame *rtw_alloc_xmitframe23a(struct xmit_priv *pxmitpriv)/* _queue
spin_lock_bh(&pfree_xmit_queue->lock); spin_lock_bh(&pfree_xmit_queue->lock);
if (_rtw_queue_empty23a(pfree_xmit_queue) == true) { 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; pxframe = NULL;
} else { } else {
phead = get_list_head(pfree_xmit_queue); phead = get_list_head(pfree_xmit_queue);
...@@ -1541,7 +1537,9 @@ struct xmit_frame *rtw_alloc_xmitframe23a(struct xmit_priv *pxmitpriv)/* _queue ...@@ -1541,7 +1537,9 @@ struct xmit_frame *rtw_alloc_xmitframe23a(struct xmit_priv *pxmitpriv)/* _queue
list_del_init(&pxframe->list); list_del_init(&pxframe->list);
pxmitpriv->free_xmitframe_cnt--; 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); spin_unlock_bh(&pfree_xmit_queue->lock);
...@@ -1947,7 +1945,7 @@ int rtw_xmit23a(struct rtw_adapter *padapter, struct sk_buff *skb) ...@@ -1947,7 +1945,7 @@ int rtw_xmit23a(struct rtw_adapter *padapter, struct sk_buff *skb)
struct xmit_frame *pxmitframe = NULL; struct xmit_frame *pxmitframe = NULL;
s32 res; s32 res;
pxmitframe = rtw_alloc_xmitframe23a(pxmitpriv); pxmitframe = rtw_alloc_xmitframe(pxmitpriv);
if (pxmitframe == NULL) { if (pxmitframe == NULL) {
RT_TRACE(_module_xmit_osdep_c_, _drv_err_, RT_TRACE(_module_xmit_osdep_c_, _drv_err_,
......
...@@ -357,7 +357,6 @@ void rtw_update_protection23a(struct rtw_adapter *padapter, u8 *ie, uint ie_len) ...@@ -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, s32 rtw_make_wlanhdr23a(struct rtw_adapter *padapter, u8 *hdr,
struct pkt_attrib *pattrib); struct pkt_attrib *pattrib);
s32 rtw_put_snap23a(u8 *data, u16 h_proto); 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_ext(struct xmit_priv *pxmitpriv);
struct xmit_frame *rtw_alloc_xmitframe23a_once(struct xmit_priv *pxmitpriv); struct xmit_frame *rtw_alloc_xmitframe23a_once(struct xmit_priv *pxmitpriv);
s32 rtw_free_xmitframe23a(struct xmit_priv *pxmitpriv, s32 rtw_free_xmitframe23a(struct xmit_priv *pxmitpriv,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment