Commit 62bb2ac5 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

mac80211: deprecate RX status noise

The noise value as is won't be used, isn't
filled by most drivers and doesn't really
make a whole lot of sense on a per packet
basis -- proper cfg80211 survey support in
mac80211 will need to be different.

Mark the struct member as deprecated so it
will be removed from drivers.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 31f66be4
...@@ -543,7 +543,7 @@ enum mac80211_rx_flags { ...@@ -543,7 +543,7 @@ enum mac80211_rx_flags {
* @signal: signal strength when receiving this frame, either in dBm, in dB or * @signal: signal strength when receiving this frame, either in dBm, in dB or
* unspecified depending on the hardware capabilities flags * unspecified depending on the hardware capabilities flags
* @IEEE80211_HW_SIGNAL_* * @IEEE80211_HW_SIGNAL_*
* @noise: noise when receiving this frame, in dBm. * @noise: noise when receiving this frame, in dBm (DEPRECATED).
* @antenna: antenna used * @antenna: antenna used
* @rate_idx: index of data rate into band's supported rates or MCS index if * @rate_idx: index of data rate into band's supported rates or MCS index if
* HT rates are use (RX_FLAG_HT) * HT rates are use (RX_FLAG_HT)
...@@ -554,7 +554,7 @@ struct ieee80211_rx_status { ...@@ -554,7 +554,7 @@ struct ieee80211_rx_status {
enum ieee80211_band band; enum ieee80211_band band;
int freq; int freq;
int signal; int signal;
int noise; int noise __deprecated;
int antenna; int antenna;
int rate_idx; int rate_idx;
int flag; int flag;
......
...@@ -57,7 +57,6 @@ STA_FILE(tx_filtered, tx_filtered_count, LU); ...@@ -57,7 +57,6 @@ STA_FILE(tx_filtered, tx_filtered_count, LU);
STA_FILE(tx_retry_failed, tx_retry_failed, LU); STA_FILE(tx_retry_failed, tx_retry_failed, LU);
STA_FILE(tx_retry_count, tx_retry_count, LU); STA_FILE(tx_retry_count, tx_retry_count, LU);
STA_FILE(last_signal, last_signal, D); STA_FILE(last_signal, last_signal, D);
STA_FILE(last_noise, last_noise, D);
STA_FILE(wep_weak_iv_count, wep_weak_iv_count, LU); STA_FILE(wep_weak_iv_count, wep_weak_iv_count, LU);
static ssize_t sta_flags_read(struct file *file, char __user *userbuf, static ssize_t sta_flags_read(struct file *file, char __user *userbuf,
...@@ -289,7 +288,6 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta) ...@@ -289,7 +288,6 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta)
DEBUGFS_ADD(tx_retry_failed); DEBUGFS_ADD(tx_retry_failed);
DEBUGFS_ADD(tx_retry_count); DEBUGFS_ADD(tx_retry_count);
DEBUGFS_ADD(last_signal); DEBUGFS_ADD(last_signal);
DEBUGFS_ADD(last_noise);
DEBUGFS_ADD(wep_weak_iv_count); DEBUGFS_ADD(wep_weak_iv_count);
DEBUGFS_ADD(ht_capa); DEBUGFS_ADD(ht_capa);
} }
......
...@@ -178,14 +178,6 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, ...@@ -178,14 +178,6 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
pos++; pos++;
} }
/* IEEE80211_RADIOTAP_DBM_ANTNOISE */
if (local->hw.flags & IEEE80211_HW_NOISE_DBM) {
*pos = status->noise;
rthdr->it_present |=
cpu_to_le32(1 << IEEE80211_RADIOTAP_DBM_ANTNOISE);
pos++;
}
/* IEEE80211_RADIOTAP_LOCK_QUALITY is missing */ /* IEEE80211_RADIOTAP_LOCK_QUALITY is missing */
/* IEEE80211_RADIOTAP_ANTENNA */ /* IEEE80211_RADIOTAP_ANTENNA */
...@@ -1077,7 +1069,6 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx) ...@@ -1077,7 +1069,6 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)
sta->rx_fragments++; sta->rx_fragments++;
sta->rx_bytes += rx->skb->len; sta->rx_bytes += rx->skb->len;
sta->last_signal = status->signal; sta->last_signal = status->signal;
sta->last_noise = status->noise;
/* /*
* Change STA power saving mode only at the end of a frame * Change STA power saving mode only at the end of a frame
......
...@@ -200,7 +200,6 @@ struct sta_ampdu_mlme { ...@@ -200,7 +200,6 @@ struct sta_ampdu_mlme {
* @rx_fragments: number of received MPDUs * @rx_fragments: number of received MPDUs
* @rx_dropped: number of dropped MPDUs from this STA * @rx_dropped: number of dropped MPDUs from this STA
* @last_signal: signal of last received frame from this STA * @last_signal: signal of last received frame from this STA
* @last_noise: noise of last received frame from this STA
* @last_seq_ctrl: last received seq/frag number from this STA (per RX queue) * @last_seq_ctrl: last received seq/frag number from this STA (per RX queue)
* @tx_filtered_count: number of frames the hardware filtered for this STA * @tx_filtered_count: number of frames the hardware filtered for this STA
* @tx_retry_failed: number of frames that failed retry * @tx_retry_failed: number of frames that failed retry
...@@ -267,7 +266,6 @@ struct sta_info { ...@@ -267,7 +266,6 @@ struct sta_info {
unsigned long rx_fragments; unsigned long rx_fragments;
unsigned long rx_dropped; unsigned long rx_dropped;
int last_signal; int last_signal;
int last_noise;
__le16 last_seq_ctrl[NUM_RX_DATA_QUEUES]; __le16 last_seq_ctrl[NUM_RX_DATA_QUEUES];
/* Updated from TX status path only, no locking requirements */ /* Updated from TX status path only, no locking requirements */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment