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

[kvmfornfv.git] / kernel / drivers / staging / rtl8188eu / core / rtw_xmit.c

diff --git a/kernel/drivers/staging/rtl8188eu/core/rtw_xmit.c b/kernel/drivers/staging/rtl8188eu/core/rtw_xmit.c
index fda169d..cabb810 100644 (file)
--- a/kernel/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/kernel/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -21,6 +21,7 @@
 
 #include <osdep_service.h>
 #include <drv_types.h>
+#include <mon.h>
 #include <wifi.h>
 #include <osdep_intf.h>
 #include <linux/vmalloc.h>
@@ -868,7 +869,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
                        /* check if enable ampdu */
                        if (pattrib->ht_en && psta->htpriv.ampdu_enable) {
                                if (psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority))
-                               pattrib->ampdu_en = true;
+                                       pattrib->ampdu_en = true;
                        }
 
                        /* re-check if enable ampdu by BA_starting_seqctrl */
@@ -1026,22 +1027,22 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
                /* adding icv, if necessary... */
                if (pattrib->iv_len) {
                        switch (pattrib->encrypt) {
-                               case _WEP40_:
-                               case _WEP104_:
-                                       WEP_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx);
-                                       break;
-                               case _TKIP_:
-                                       if (bmcst)
-                                               TKIP_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx);
-                                       else
-                                               TKIP_IV(pattrib->iv, psta->dot11txpn, 0);
-                                       break;
-                               case _AES_:
-                                       if (bmcst)
-                                               AES_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx);
-                                       else
-                                               AES_IV(pattrib->iv, psta->dot11txpn, 0);
-                                       break;
+                       case _WEP40_:
+                       case _WEP104_:
+                               WEP_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx);
+                               break;
+                       case _TKIP_:
+                               if (bmcst)
+                                       TKIP_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx);
+                               else
+                                       TKIP_IV(pattrib->iv, psta->dot11txpn, 0);
+                               break;
+                       case _AES_:
+                               if (bmcst)
+                                       AES_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx);
+                               else
+                                       AES_IV(pattrib->iv, psta->dot11txpn, 0);
+                               break;
                        }
 
                        memcpy(pframe, pattrib->iv, pattrib->iv_len);
@@ -1100,6 +1101,9 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
                memcpy(mem_start, pbuf_start + hw_hdr_offset, pattrib->hdrlen);
        }
 
+       /* Frame is about to be encrypted. Forward it to the monitor first. */
+       rtl88eu_mon_xmit_hook(padapter->pmondev, pxmitframe, frg_len);
+
        if (xmitframe_addmic(padapter, pxmitframe) == _FAIL) {
                RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic(padapter, pxmitframe) == _FAIL\n"));
                DBG_88E("xmitframe_addmic(padapter, pxmitframe) == _FAIL\n");
@@ -1769,7 +1773,7 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fra
        int bmcst = IS_MCAST(pattrib->ra);
 
        if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == false)
-           return ret;
+               return ret;
 
        if (pattrib->psta)
                psta = pattrib->psta;