staging: r8188eu: Remove get_recvframe_data()

This inline function checks that the pointer is not NULL and then returns
the rx_data member. Unfortunately, all 3 callers of this function have
dereferenced that pointer before this routine is called. As the check for
NULL is useless, eliminate the routine.

Reported-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index be0dfc169f1ba84a2428e2650ac1828f778f6d38..0c8b338dc6d3dbc0cb2e30d89aceba433079e7af 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -562,7 +562,7 @@ static struct recv_frame *portctrl(struct adapter *adapter,
 
        auth_alg = adapter->securitypriv.dot11AuthAlgrthm;
 
-       ptr = get_recvframe_data(precv_frame);
+       ptr = precv_frame->rx_data;
        pfhdr = precv_frame;
        pattrib = &pfhdr->attrib;
        psta_addr = pattrib->ta;
@@ -1440,11 +1440,9 @@ static int wlanhdr_to_ethhdr(struct recv_frame *precvframe)
        int ret = _SUCCESS;
        struct adapter          *adapter = precvframe->adapter;
        struct mlme_priv        *pmlmepriv = &adapter->mlmepriv;
-
-       u8      *ptr = get_recvframe_data(precvframe); /*  point to frame_ctrl field */
+       u8 *ptr = precvframe->rx_data;
        struct rx_pkt_attrib *pattrib = &precvframe->attrib;
 
-
        if (pattrib->encrypt)
                recvframe_pull_tail(precvframe, pattrib->icv_len);
 

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c b/drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c
index f29bb79a757bcd4e2a03c61b3af163ddc720844a..43eb960e4e0bd65d3cc3ecd229e21a0cb18f7099 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c
@@ -157,7 +157,7 @@ void update_recvframe_phyinfo_88e(struct recv_frame *precvframe,
        pkt_info.bPacketToSelf = false;
        pkt_info.bPacketBeacon = false;
 
-       wlanhdr = get_recvframe_data(precvframe);
+       wlanhdr = precvframe->rx_data;
 
        pkt_info.bPacketMatchBSSID = ((!IsFrameTypeCtrl(wlanhdr)) &&
                !pattrib->icv_err && !pattrib->crc_err &&

diff --git a/drivers/staging/rtl8188eu/include/rtw_recv.h b/drivers/staging/rtl8188eu/include/rtw_recv.h
index 1f4d98439df2527c38b29fe7d0e791c9b5bb8fa5..bcbce46cec85020d3bafbf2545597fd96a095166 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_recv.h
+++ b/drivers/staging/rtl8188eu/include/rtw_recv.h
@@ -321,15 +321,6 @@ static inline u8 *get_rx_status(struct recv_frame *precvframe)
        return get_rxmem(precvframe);
 }
 
-static inline u8 *get_recvframe_data(struct recv_frame *precvframe)
-{
-       /* always return rx_data */
-       if (precvframe == NULL)
-               return NULL;
-
-       return precvframe->rx_data;
-}
-
 static inline u8 *recvframe_push(struct recv_frame *precvframe, int sz)
 {
        /*  append data before rx_data */