diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c
index b6db2e7..8709f88 100644
--- a/core/rtw_xmit.c
+++ b/core/rtw_xmit.c
@@ -4570,9 +4570,11 @@ s32 rtw_monitor_xmit_entry(struct sk_buff *skb, struct net_device *ndev)
 	unsigned char	*pframe;
 	u8 dummybuf[32];
 	int len = skb->len, rtap_len;
-
-
-	rtw_mstat_update(MSTAT_TYPE_SKB, MSTAT_ALLOC_SUCCESS, skb->truesize);
+#ifdef CONFIG_MONITOR_MODE_XMIT
+    int consume;
+#endif  /* CONFIG_MONITOR_MODE_XMIT */
+	if (likely(skb))
+		rtw_mstat_update(MSTAT_TYPE_SKB, MSTAT_ALLOC_SUCCESS, skb->truesize);
 
 #ifndef CONFIG_CUSTOMER_ALIBABA_GENERAL
 	if (unlikely(skb->len < sizeof(struct ieee80211_radiotap_header)))
@@ -4587,13 +4589,25 @@ s32 rtw_monitor_xmit_entry(struct sk_buff *skb, struct net_device *ndev)
 	if (unlikely(skb->len < rtap_len))
 		goto fail;
 
+#ifdef CONFIG_MONITOR_MODE_XMIT
+	len -= sizeof(struct ieee80211_radiotap_header);
+	rtap_len -= sizeof(struct ieee80211_radiotap_header);
+
+	while(rtap_len) {
+		consume = rtap_len > sizeof(dummybuf) ? sizeof(dummybuf) : rtap_len;
+		_rtw_pktfile_read(&pktfile, dummybuf, consume);
+		rtap_len -= consume;
+		len -= consume;
+	}
+#else /* CONFIG_MONITOR_MODE_XMIT */
 	if (rtap_len != 12) {
 		RTW_INFO("radiotap len (should be 14): %d\n", rtap_len);
 		goto fail;
 	}
 	_rtw_pktfile_read(&pktfile, dummybuf, rtap_len-sizeof(struct ieee80211_radiotap_header));
 	len = len - rtap_len;
-#endif
+#endif /* CONFIG_MONITOR_MODE_XMIT */
+#endif /* CONFIG_CUSTOMER_ALIBABA_GENERAL */
 	pmgntframe = alloc_mgtxmitframe(pxmitpriv);
 	if (pmgntframe == NULL) {
 		rtw_udelay_os(500);
@@ -4633,6 +4647,9 @@ s32 rtw_monitor_xmit_entry(struct sk_buff *skb, struct net_device *ndev)
 	dump_mgntframe(padapter, pmgntframe);
 
 fail:
+#ifdef CONFIG_MONITOR_MODE_XMIT
+	rtw_endofpktfile(&pktfile);
+#endif /* CONFIG_MONITOR_MODE_XMIT */
 	rtw_skb_free(skb);
 	return 0;
 }
diff --git a/include/drv_conf.h b/include/drv_conf.h
index 6c49a65..e2d0474 100755
--- a/include/drv_conf.h
+++ b/include/drv_conf.h
@@ -111,7 +111,7 @@
 #endif
 
 #ifdef CONFIG_WIFI_MONITOR
-	/*	#define CONFIG_MONITOR_MODE_XMIT	*/
+		#define CONFIG_MONITOR_MODE_XMIT
 #endif
 
 #ifdef CONFIG_CUSTOMER_ALIBABA_GENERAL