Page MenuHomeFreeBSD
Files F170657660

D3820.diff
No OneTemporary
Actions

D3820.diff
View Options

Index: head/sys/dev/usb/wlan/if_urtwn.c
===================================================================
--- head/sys/dev/usb/wlan/if_urtwn.c
+++ head/sys/dev/usb/wlan/if_urtwn.c
@@ -86,7 +86,6 @@
"Debug level");
#endif
-#define URTWN_RSSI(r) (r) - 110
#define IEEE80211_HAS_ADDR4(wh) IEEE80211_IS_DSTODS(wh)
/* various supported device vendors/products */
@@ -641,11 +640,6 @@
rssi = urtwn_get_rssi(sc, rate, &stat[1]);
/* Update our average RSSI. */
urtwn_update_avgrssi(sc, rate, rssi);
- /*
- * Convert the RSSI to a range that will be accepted
- * by net80211.
- */
- rssi = URTWN_RSSI(rssi);
}
m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
@@ -792,10 +786,12 @@
(struct ieee80211_frame_min *)wh);
nf = URTWN_NOISE_FLOOR;
if (ni != NULL) {
- (void)ieee80211_input(ni, m, rssi, nf);
+ (void)ieee80211_input(ni, m, rssi - nf, nf);
ieee80211_free_node(ni);
- } else
- (void)ieee80211_input_all(ic, m, rssi, nf);
+ } else {
+ (void)ieee80211_input_all(ic, m, rssi - nf,
+ nf);
+ }
m = next;
}
URTWN_LOCK(sc);
Index: head/sys/dev/usb/wlan/if_urtwnreg.h
===================================================================
--- head/sys/dev/usb/wlan/if_urtwnreg.h
+++ head/sys/dev/usb/wlan/if_urtwnreg.h
@@ -975,22 +975,22 @@
struct r88e_rx_cck {
uint8_t path_agc[2];
+ uint8_t chan;
+ uint8_t reserved1;
uint8_t sig_qual;
uint8_t agc_rpt;
uint8_t rpt_b;
- uint8_t reserved1;
+ uint8_t reserved2;
uint8_t noise_power;
uint8_t path_cfotail[2];
uint8_t pcts_mask[2];
uint8_t stream_rxevm[2];
uint8_t path_rxsnr[2];
uint8_t noise_power_db_lsb;
- uint8_t reserved2[3];
+ uint8_t reserved3[3];
uint8_t stream_csi[2];
uint8_t stream_target_csi[2];
uint8_t sig_evm;
- uint8_t reserved3;
- uint8_t reserved4;
} __packed;
/* Tx MAC descriptor. */

File Metadata

Mime Type
text/plain
Expires
Sun, Sep 6, 8:44 PM (16 m, 33 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38414641
Default Alt Text
D3820.diff (1 KB)

Event Timeline