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

[kvmfornfv.git] / kernel / drivers / staging / rtl8723au / core / rtw_recv.c

diff --git a/kernel/drivers/staging/rtl8723au/core/rtw_recv.c b/kernel/drivers/staging/rtl8723au/core/rtw_recv.c
index 274a4b6..404b618 100644 (file)
--- a/kernel/drivers/staging/rtl8723au/core/rtw_recv.c
+++ b/kernel/drivers/staging/rtl8723au/core/rtw_recv.c
@@ -626,7 +626,7 @@ void process23a_pwrbit_data(struct rtw_adapter *padapter,
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
        struct rx_pkt_attrib *pattrib = &precv_frame->attrib;
        struct sta_priv *pstapriv = &padapter->stapriv;
-       struct sta_info *psta = NULL;
+       struct sta_info *psta;
 
        psta = rtw_get_stainfo23a(pstapriv, pattrib->src);
 
@@ -653,7 +653,7 @@ void process_wmmps_data(struct rtw_adapter *padapter,
 #ifdef CONFIG_8723AU_AP_MODE
        struct rx_pkt_attrib *pattrib = &precv_frame->attrib;
        struct sta_priv *pstapriv = &padapter->stapriv;
-       struct sta_info *psta = NULL;
+       struct sta_info *psta;
 
        psta = rtw_get_stainfo23a(pstapriv, pattrib->src);
 
@@ -1554,8 +1554,7 @@ static int wlanhdr_to_ethhdr (struct recv_frame *precvframe)
        ether_addr_copy(ptr + ETH_ALEN, pattrib->src);
 
        if (!bsnaphdr) {
-               len = htons(len);
-               memcpy(ptr + 12, &len, 2);
+               put_unaligned_be16(len, ptr + 12);
        }
 
 
@@ -2152,7 +2151,7 @@ int process_recv_indicatepkts(struct rtw_adapter *padapter,
 static int recv_func_prehandle(struct rtw_adapter *padapter,
                               struct recv_frame *rframe)
 {
-       int ret = _SUCCESS;
+       int ret;
 
        /* check the frame crtl field and decache */
        ret = validate_recv_frame(padapter, rframe);