minoplhy/88x2bu-20210702
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert: enhance Monitor mode capture capability (PKMID)

Browse Source
This commit is contained in:
morrownr 2021-12-31 14:34:22 -06:00
parent 38c0b75bcf
commit 646131a0c7
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/monitor/rtw_radiotap.c
View File

@ -198,6 +198,7 @@ sint rtw_fill_radiotap_hdr(_adapter *padapter, struct rx_pkt_attrib *a, u8 *buf)
/* each antenna information */ /* each antenna information */
rx_cnt = rf_type_to_rf_rx_cnt(pHalData->rf_type); rx_cnt = rf_type_to_rf_rx_cnt(pHalData->rf_type);
#if 0
if (rx_cnt > 1) { if (rx_cnt > 1) {
rtap_hdr->it_present |= BIT(IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE) | rtap_hdr->it_present |= BIT(IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE) |
BIT(IEEE80211_RADIOTAP_EXT); BIT(IEEE80211_RADIOTAP_EXT);
@ -218,9 +219,10 @@ sint rtw_fill_radiotap_hdr(_adapter *padapter, struct rx_pkt_attrib *a, u8 *buf)
_rtw_memcpy(&hdr_buf[rt_len], &tmp_32bit, 4); _rtw_memcpy(&hdr_buf[rt_len], &tmp_32bit, 4);
rt_len += 4; rt_len += 4;
} }
#endif
/* tsft, Required Alignment: 8 bytes */ /* tsft, Required Alignment: 8 bytes */
if (a->free_cnt) { if (0) { //(a->free_cnt) {
/* TSFT + free_cnt */ /* TSFT + free_cnt */
rtap_hdr->it_present |= BIT(IEEE80211_RADIOTAP_TSFT); rtap_hdr->it_present |= BIT(IEEE80211_RADIOTAP_TSFT);
if (!IS_ALIGNED(rt_len, 8)) if (!IS_ALIGNED(rt_len, 8))
@ -285,11 +287,13 @@ sint rtw_fill_radiotap_hdr(_adapter *padapter, struct rx_pkt_attrib *a, u8 *buf)
hdr_buf[rt_len] = a->phy_info.recv_signal_power; hdr_buf[rt_len] = a->phy_info.recv_signal_power;
rt_len += 1; rt_len += 1;
#if 0
/* dBm Antenna Noise */ /* dBm Antenna Noise */
rtap_hdr->it_present |= BIT(IEEE80211_RADIOTAP_DBM_ANTNOISE); rtap_hdr->it_present |= BIT(IEEE80211_RADIOTAP_DBM_ANTNOISE);
hdr_buf[rt_len] = 0; hdr_buf[rt_len] = 0;
rt_len += 1; rt_len += 1;
#endif
#if 0
/* Signal Quality, Required Alignment: 2 bytes */ /* Signal Quality, Required Alignment: 2 bytes */
rtap_hdr->it_present |= BIT(IEEE80211_RADIOTAP_LOCK_QUALITY); rtap_hdr->it_present |= BIT(IEEE80211_RADIOTAP_LOCK_QUALITY);
if (!IS_ALIGNED(rt_len, 2)) if (!IS_ALIGNED(rt_len, 2))
@ -297,16 +301,21 @@ sint rtw_fill_radiotap_hdr(_adapter *padapter, struct rx_pkt_attrib *a, u8 *buf)
hdr_buf[rt_len] = a->phy_info.signal_quality; hdr_buf[rt_len] = a->phy_info.signal_quality;
rt_len += 2; rt_len += 2;
#endif
#if 0
/* Antenna */ /* Antenna */
rtap_hdr->it_present |= BIT(IEEE80211_RADIOTAP_ANTENNA); rtap_hdr->it_present |= BIT(IEEE80211_RADIOTAP_ANTENNA);
hdr_buf[rt_len] = 0; /* pHalData->rf_type; */ hdr_buf[rt_len] = 0; /* pHalData->rf_type; */
rt_len += 1; rt_len += 1;
#endif
#if 0
/* RX flags, Required Alignment: 2 bytes */ /* RX flags, Required Alignment: 2 bytes */
rtap_hdr->it_present |= BIT(IEEE80211_RADIOTAP_RX_FLAGS); rtap_hdr->it_present |= BIT(IEEE80211_RADIOTAP_RX_FLAGS);
tmp_16bit = 0; tmp_16bit = 0;
_rtw_memcpy(&hdr_buf[rt_len], &tmp_16bit, 2); _rtw_memcpy(&hdr_buf[rt_len], &tmp_16bit, 2);
rt_len += 2; rt_len += 2;
#endif
/* MCS information, Required Alignment: 1 bytes */ /* MCS information, Required Alignment: 1 bytes */
if (a->data_rate >= DESC_RATEMCS0 && a->data_rate <= DESC_RATEMCS31) { if (a->data_rate >= DESC_RATEMCS0 && a->data_rate <= DESC_RATEMCS31) {
@ -521,7 +530,7 @@ sint rtw_fill_radiotap_hdr(_adapter *padapter, struct rx_pkt_attrib *a, u8 *buf)
} }
/* frame timestamp, Required Alignment: 8 bytes */ /* frame timestamp, Required Alignment: 8 bytes */
if (a->free_cnt) { if (0) { //(a->free_cnt) {
rtap_hdr->it_present |= BIT(IEEE80211_RADIOTAP_TIMESTAMP); rtap_hdr->it_present |= BIT(IEEE80211_RADIOTAP_TIMESTAMP);
if (!IS_ALIGNED(rt_len, 8)) if (!IS_ALIGNED(rt_len, 8))
rt_len = ((rt_len + 7) & 0xFFF8); /* Alignment */ rt_len = ((rt_len + 7) & 0xFFF8); /* Alignment */
@ -547,6 +556,7 @@ sint rtw_fill_radiotap_hdr(_adapter *padapter, struct rx_pkt_attrib *a, u8 *buf)
} }
/* each antenna information */ /* each antenna information */
#if 0
if (rx_cnt > 1) { if (rx_cnt > 1) {
for (i = 0; i <= rx_cnt; i++) { for (i = 0; i <= rx_cnt; i++) {
/* dBm Antenna Signal */ /* dBm Antenna Signal */
@ -564,6 +574,7 @@ sint rtw_fill_radiotap_hdr(_adapter *padapter, struct rx_pkt_attrib *a, u8 *buf)
rt_len += 1; rt_len += 1;
} }
} }
#endif
/* push to skb */ /* push to skb */
pskb = (_pkt *)buf; pskb = (_pkt *)buf;