staging: r8188eu: Fix some sparse warnings
authorLarry Finger <Larry.Finger@lwfinger.net>
Thu, 17 Apr 2014 15:35:22 +0000 (10:35 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 May 2014 11:22:53 +0000 (20:22 +0900)
In a patch entitles "staging: r8188eu: Fix case where ethtype was never obtained
and always be checked against 0" (commit ID unknown), I introduce an endian error.
This patch fixes that, and removes two additional sparse warnings.

drivers/staging/rtl8188eu/core/rtw_recv.c:653:6: warning: symbol 'process_pwrbit_data' was not declared. Should it be static?
drivers/staging/rtl8188eu/core/rtw_recv.c:1828:5: warning: symbol 'enqueue_reorder_recvframe' was not declared. Should it be static?

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/core/rtw_recv.c

index da26fa5..723996e 100644 (file)
@@ -505,6 +505,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;
@@ -524,8 +525,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 */
@@ -598,8 +599,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;
@@ -1773,8 +1774,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;