Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[karo-tx-linux.git] / drivers / staging / rtl8188eu / core / rtw_recv.c

diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index e305d43ebd0656210d111403ad1ef5ab7a818f87..0e73df5975b8f919800b6904d6955cdffee153ac 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -63,8 +63,6 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
 
        int     res = _SUCCESS;
 
-       spin_lock_init(&precvpriv->lock);
-
        _rtw_init_queue(&precvpriv->free_recv_queue);
        _rtw_init_queue(&precvpriv->recv_pending_queue);
        _rtw_init_queue(&precvpriv->uc_swdec_pending_queue);
@@ -73,8 +71,6 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
 
        precvpriv->free_recvframe_cnt = NR_RECVFRAME;
 
-       rtw_os_recv_resource_init(precvpriv, padapter);
-
        precvpriv->pallocated_frame_buf = vzalloc(NR_RECVFRAME * sizeof(struct recv_frame) + RXFRAME_ALIGN_SZ);
 
        if (precvpriv->pallocated_frame_buf == NULL) {
@@ -101,8 +97,6 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
        }
        precvpriv->rx_pending_cnt = 1;
 
-       sema_init(&precvpriv->allrxreturnevt, 0);
-
        res = rtw_hal_init_recv_priv(padapter);
 
        _init_timer(&precvpriv->signal_stat_timer, padapter->pnetdev, RTW_TIMER_HDL_NAME(signal_stat), padapter);
@@ -123,8 +117,6 @@ void _rtw_free_recv_priv (struct recv_priv *precvpriv)
 
        rtw_free_uc_swdec_pending_queue(padapter);
 
-       rtw_os_recv_resource_free(precvpriv);
-
        if (precvpriv->pallocated_frame_buf) {
                vfree(precvpriv->pallocated_frame_buf);
        }
@@ -289,55 +281,6 @@ u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter)
        return cnt;
 }
 
-int rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, struct __queue *queue)
-{
-       spin_lock_bh(&queue->lock);
-
-       rtw_list_delete(&precvbuf->list);
-       rtw_list_insert_head(&precvbuf->list, get_list_head(queue));
-
-       spin_unlock_bh(&queue->lock);
-
-       return _SUCCESS;
-}
-
-int rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue)
-{
-       unsigned long irqL;
-       spin_lock_irqsave(&queue->lock, irqL);
-
-       rtw_list_delete(&precvbuf->list);
-
-       rtw_list_insert_tail(&precvbuf->list, get_list_head(queue));
-       spin_unlock_irqrestore(&queue->lock, irqL);
-       return _SUCCESS;
-}
-
-struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue)
-{
-       unsigned long irqL;
-       struct recv_buf *precvbuf;
-       struct list_head *plist, *phead;
-
-       spin_lock_irqsave(&queue->lock, irqL);
-
-       if (_rtw_queue_empty(queue)) {
-               precvbuf = NULL;
-       } else {
-               phead = get_list_head(queue);
-
-               plist = phead->next;
-
-               precvbuf = container_of(plist, struct recv_buf, list);
-
-               rtw_list_delete(&precvbuf->list);
-       }
-
-       spin_unlock_irqrestore(&queue->lock, irqL);
-
-       return precvbuf;
-}
-
 static int recvframe_chkmic(struct adapter *adapter,
                            struct recv_frame *precvframe)
 {
@@ -554,6 +497,7 @@ static struct recv_frame *portctrl(struct adapter *adapter,
        u16     ether_type;
        u16  eapol_type = 0x888e;/* for Funia BD's WPA issue */
        struct rx_pkt_attrib *pattrib;
+       __be16 be_tmp;
 
 
        pstapriv = &adapter->stapriv;
@@ -573,8 +517,8 @@ static struct recv_frame *portctrl(struct adapter *adapter,
        if (auth_alg == 2) {
                /* get ether_type */
                ptr = ptr + pfhdr->attrib.hdrlen + LLC_HEADER_SIZE;
-               memcpy(&ether_type, ptr, 2);
-               ether_type = ntohs((unsigned short)ether_type);
+               memcpy(&be_tmp, ptr, 2);
+               ether_type = ntohs(be_tmp);
 
                if ((psta != NULL) && (psta->ieee8021x_blocked)) {
                        /* blocked */
@@ -647,8 +591,8 @@ static int recv_decache(struct recv_frame *precv_frame, u8 bretry,
        return _SUCCESS;
 }
 
-void process_pwrbit_data(struct adapter *padapter,
-                        struct recv_frame *precv_frame)
+static void process_pwrbit_data(struct adapter *padapter,
+                               struct recv_frame *precv_frame)
 {
 #ifdef CONFIG_88EU_AP_MODE
        unsigned char pwrbit;
@@ -1822,8 +1766,8 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_n
        return true;
 }
 
-int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl,
-                             struct recv_frame *prframe)
+static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl,
+                                    struct recv_frame *prframe)
 {
        struct rx_pkt_attrib *pattrib = &prframe->attrib;
        struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
@@ -1871,7 +1815,7 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor
                        return true;
 
                prhdr = container_of(plist, struct recv_frame, list);
-               pattrib = &prhdr->attrib;
+               pattrib = &prhdr->attrib;
                preorder_ctrl->indicate_seq = pattrib->seq_num;
        }