mirrors/rtl8812au-chinawrj
1
0
Fork 0
mirror of https://github.com/chinawrj/rtl8812au synced 2024-11-27 23:54:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not place signal strength into radiotap header if this information is not available

Browse Source
This commit is contained in:
Sergei Makarenkov 2016-12-18 19:54:27 +03:00 committed by astsam
parent f80e7b72d4
commit 428c2172d5
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/rtw_recv.c
View File

@ -3618,7 +3618,7 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe,
rtap_hdr = (struct ieee80211_radiotap_header *)&hdr_buf[0];
rtap_hdr->it_version = PKTHDR_RADIOTAP_VERSION;
if(pHalData->NumTotalRFPath>0) {
if(pHalData->NumTotalRFPath>0 && pattrib->physt) {
rtap_hdr->it_present |= (1<<IEEE80211_RADIOTAP_EXT) |
(1<<IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE);
@ -3719,10 +3719,11 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe,
memcpy(&hdr_buf[rt_len], &tmp_16bit, 2);
rt_len += 2;
/* dBm Antenna Signal */
rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL);
hdr_buf[rt_len] = pattrib->phy_info.RecvSignalPower;
rt_len += 1;
if(pattrib->physt) {
/* dBm Antenna Signal */
rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL);
hdr_buf[rt_len] = pattrib->phy_info.RecvSignalPower;
rt_len += 1;
#if 0
/* dBm Antenna Noise */
@ -3731,7 +3732,9 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe,
rt_len += 1;
#endif
rt_len++; // alignment
rt_len++; // alignment
}
/* Signal Quality */
rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_LOCK_QUALITY);
tmp_16bit = cpu_to_le16(pattrib->phy_info.SignalQuality);
@ -3850,13 +3853,14 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe,
rt_len += 2;
}
for(i=0; i<pHalData->NumTotalRFPath; i++) {
hdr_buf[rt_len] = pattrib->phy_info.RxPwr[i];
rt_len ++;
hdr_buf[rt_len] = i;
rt_len ++;
if (pattrib->physt) {
for(i=0; i<pHalData->NumTotalRFPath; i++) {
hdr_buf[rt_len] = pattrib->phy_info.RxPwr[i];
rt_len ++;
hdr_buf[rt_len] = i;
rt_len ++;
}
}
/* push to skb */
pskb = (_pkt *)buf;
if (skb_headroom(pskb) < rt_len) {