These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / rtl8188eu / os_dep / recv_linux.c

diff --git a/kernel/drivers/staging/rtl8188eu/os_dep/recv_linux.c b/kernel/drivers/staging/rtl8188eu/os_dep/recv_linux.c
index 0570132..d4734ba 100644 (file)
--- a/kernel/drivers/staging/rtl8188eu/os_dep/recv_linux.c
+++ b/kernel/drivers/staging/rtl8188eu/os_dep/recv_linux.c
@@ -17,8 +17,6 @@
  *
  *
  ******************************************************************************/
-#define _RECV_OSDEP_C_
-
 #include <osdep_service.h>
 #include <drv_types.h>
 
@@ -29,26 +27,22 @@
 #include <usb_ops_linux.h>
 
 /* alloc os related resource in struct recv_frame */
-int rtw_os_recv_resource_alloc(struct adapter *padapter,
-                              struct recv_frame *precvframe)
+void rtw_os_recv_resource_alloc(struct recv_frame *precvframe)
 {
        precvframe->pkt_newalloc = NULL;
        precvframe->pkt = NULL;
-       return _SUCCESS;
 }
 
 /* alloc os related resource in struct recv_buf */
 int rtw_os_recvbuf_resource_alloc(struct adapter *padapter,
                                  struct recv_buf *precvbuf)
 {
-       int res = _SUCCESS;
-
-       precvbuf->purb = usb_alloc_urb(0, GFP_KERNEL);
-       if (precvbuf->purb == NULL)
-               res = _FAIL;
        precvbuf->pskb = NULL;
        precvbuf->reuse = false;
-       return res;
+       precvbuf->purb = usb_alloc_urb(0, GFP_KERNEL);
+       if (!precvbuf->purb)
+               return _FAIL;
+       return _SUCCESS;
 }
 
 void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup)
@@ -100,7 +94,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter,
        pfree_recv_queue = &(precvpriv->free_recv_queue);
 
        skb = precv_frame->pkt;
-       if (skb == NULL) {
+       if (!skb) {
                RT_TRACE(_module_recv_osdep_c_, _drv_err_,
                         ("rtw_recv_indicatepkt():skb == NULL something wrong!!!!\n"));
                goto _recv_indicatepkt_drop;