|
@@ -1038,6 +1038,7 @@ static int ath_process_fft(struct ath_softc *sc, struct ieee80211_hdr *hdr,
|
|
|
struct ath_ht20_mag_info *mag_info;
|
|
|
int len = rs->rs_datalen;
|
|
|
int dc_pos;
|
|
|
+ u16 length, max_magnitude;
|
|
|
|
|
|
/* AR9280 and before report via ATH9K_PHYERR_RADAR, AR93xx and newer
|
|
|
* via ATH9K_PHYERR_SPECTRAL. Haven't seen ATH9K_PHYERR_FALSE_RADAR_EXT
|
|
@@ -1065,8 +1066,8 @@ static int ath_process_fft(struct ath_softc *sc, struct ieee80211_hdr *hdr,
|
|
|
return 1;
|
|
|
|
|
|
fft_sample.tlv.type = ATH_FFT_SAMPLE_HT20;
|
|
|
- fft_sample.tlv.length = sizeof(fft_sample) - sizeof(fft_sample.tlv);
|
|
|
- fft_sample.tlv.length = __cpu_to_be16(fft_sample.tlv.length);
|
|
|
+ length = sizeof(fft_sample) - sizeof(fft_sample.tlv);
|
|
|
+ fft_sample.tlv.length = __cpu_to_be16(length);
|
|
|
|
|
|
fft_sample.freq = __cpu_to_be16(ah->curchan->chan->center_freq);
|
|
|
fft_sample.rssi = fix_rssi_inv_only(rs->rs_rssi_ctl0);
|
|
@@ -1112,8 +1113,8 @@ static int ath_process_fft(struct ath_softc *sc, struct ieee80211_hdr *hdr,
|
|
|
memcpy(fft_sample.data, bins, SPECTRAL_HT20_NUM_BINS);
|
|
|
fft_sample.max_exp = mag_info->max_exp & 0xf;
|
|
|
|
|
|
- fft_sample.max_magnitude = spectral_max_magnitude(mag_info->all_bins);
|
|
|
- fft_sample.max_magnitude = __cpu_to_be16(fft_sample.max_magnitude);
|
|
|
+ max_magnitude = spectral_max_magnitude(mag_info->all_bins);
|
|
|
+ fft_sample.max_magnitude = __cpu_to_be16(max_magnitude);
|
|
|
fft_sample.max_index = spectral_max_index(mag_info->all_bins);
|
|
|
fft_sample.bitmap_weight = spectral_bitmap_weight(mag_info->all_bins);
|
|
|
fft_sample.tsf = __cpu_to_be64(tsf);
|