staging: rtl8712: r8712_wlanhdr_to_ethhdr(): Change return values

Change return values of r8712_wlanhdr_to_ethhdr from _SUCCESS/_FAIL to
0/-ENOMEM. Modify the function containing a call site of
r8712_wlanhdr_to_ethhdr so that it compares the return value to
0/-ENOMEM instead of _SUCCESS/_FAIL.
Change the return type of r8712_wlanhdr_to_ethhdr from sint to int to
match its prototype in corresponding .h file.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190808064012.12661-3-nishkadg.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c
index 3950b2424b6419e23685e6a0c039f2d00ce3803e..0c571289865332f1627508b1f29337498302a87b 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_recv.c
+++ b/drivers/staging/rtl8712/rtl8712_recv.c
@@ -638,8 +638,8 @@ static int r8712_process_recv_indicatepkts(struct _adapter *padapter,
                }
        } else { /*B/G mode*/
                retval = r8712_wlanhdr_to_ethhdr(prframe);
-               if (retval != _SUCCESS)
-                       return retval;
+               if (retval)
+                       return _FAIL;
                if (!padapter->driver_stopped && !padapter->surprise_removed) {
                        /* indicate this recv_frame */
                        r8712_recv_indicatepkt(padapter, prframe);

diff --git a/drivers/staging/rtl8712/rtl871x_recv.c b/drivers/staging/rtl8712/rtl871x_recv.c
index 79c7a329e9f6e19930b764036affa0e98a3d430d..4fae3af36af5d9cd48db8322c10cbac4b39f40c2 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_recv.c
+++ b/drivers/staging/rtl8712/rtl871x_recv.c
@@ -585,7 +585,7 @@ sint r8712_validate_recv_frame(struct _adapter *adapter,
        return retval;
 }
 
-sint r8712_wlanhdr_to_ethhdr(union recv_frame *precvframe)
+int r8712_wlanhdr_to_ethhdr(union recv_frame *precvframe)
 {
        /*remove the wlanhdr and add the eth_hdr*/
        sint    rmv_len;
@@ -628,14 +628,14 @@ sint r8712_wlanhdr_to_ethhdr(union recv_frame *precvframe)
                ptr = recvframe_pull(precvframe, (rmv_len -
                      sizeof(struct ethhdr) + 2) - 24);
                if (!ptr)
-                       return _FAIL;
+                       return -ENOMEM;
                memcpy(ptr, get_rxmem(precvframe), 24);
                ptr += 24;
        } else {
                ptr = recvframe_pull(precvframe, (rmv_len -
                      sizeof(struct ethhdr) + (bsnaphdr ? 2 : 0)));
                if (!ptr)
-                       return _FAIL;
+                       return -ENOMEM;
        }
 
        memcpy(ptr, pattrib->dst, ETH_ALEN);
@@ -645,7 +645,7 @@ sint r8712_wlanhdr_to_ethhdr(union recv_frame *precvframe)
 
                memcpy(ptr + 12, &be_tmp, 2);
        }
-       return _SUCCESS;
+       return 0;
 }
 
 s32 r8712_recv_entry(union recv_frame *precvframe)