Return-path: Received: from mail-ee0-f49.google.com ([74.125.83.49]:39136 "EHLO mail-ee0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758500AbaCSIth (ORCPT ); Wed, 19 Mar 2014 04:49:37 -0400 Received: by mail-ee0-f49.google.com with SMTP id c41so6301375eek.36 for ; Wed, 19 Mar 2014 01:49:36 -0700 (PDT) From: Janusz Dziedzic To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Janusz Dziedzic Subject: [RFC v2 4/8] ath10k: kill signal field in htt_rx_info Date: Wed, 19 Mar 2014 09:48:59 +0100 Message-Id: <1395218943-31704-4-git-send-email-janusz.dziedzic@tieto.com> (sfid-20140319_094954_630948_370BD35B) In-Reply-To: <1395218943-31704-1-git-send-email-janusz.dziedzic@tieto.com> References: <1395218943-31704-1-git-send-email-janusz.dziedzic@tieto.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: Setup signal field directly in ieee80211_rx_status. Signed-off-by: Janusz Dziedzic --- drivers/net/wireless/ath/ath10k/htt.h | 1 - drivers/net/wireless/ath/ath10k/htt_rx.c | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h index e80f033..9f5da2b 100644 --- a/drivers/net/wireless/ath/ath10k/htt.h +++ b/drivers/net/wireless/ath/ath10k/htt.h @@ -1178,7 +1178,6 @@ struct htt_rx_info { struct ieee80211_rx_status rx_status; enum htt_rx_mpdu_status status; enum htt_rx_mpdu_encrypt_type encrypt_type; - s8 signal; struct { u8 info0; u32 info1; diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index f18e41c..415ef1c 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c @@ -775,8 +775,6 @@ static void ath10k_process_rx(struct ath10k *ar, struct htt_rx_info *info) if (info->amsdu_more) status->flag |= RX_FLAG_AMSDU_MORE; - status->signal = info->signal; - spin_lock_bh(&ar->data_lock); ch = ar->scan_channel; if (!ch) @@ -1207,8 +1205,8 @@ static void ath10k_htt_rx_handler(struct ath10k_htt *htt, mpdu_ranges = htt_rx_ind_get_mpdu_ranges(rx); /* Fill this once, while this is per-ppdu */ - info.signal = ATH10K_DEFAULT_NOISE_FLOOR; - info.signal += rx->ppdu.combined_rssi; + info.rx_status.signal = ATH10K_DEFAULT_NOISE_FLOOR; + info.rx_status.signal += rx->ppdu.combined_rssi; info.rate.info0 = rx->ppdu.info0; info.rate.info1 = __le32_to_cpu(rx->ppdu.info1); -- 1.7.9.5