mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
mac80211: remove deprecated noise field from ieee80211_rx_status
Also remove associated IEEE80211_HW_NOISE_DBM from ieee80211_hw_flags. Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
49b5c7f473
commit
f5c044e53a
12 changed files with 8 additions and 25 deletions
|
@ -2550,8 +2550,7 @@ void *ar9170_alloc(size_t priv_size)
|
||||||
BIT(NL80211_IFTYPE_ADHOC);
|
BIT(NL80211_IFTYPE_ADHOC);
|
||||||
ar->hw->flags |= IEEE80211_HW_RX_INCLUDES_FCS |
|
ar->hw->flags |= IEEE80211_HW_RX_INCLUDES_FCS |
|
||||||
IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
|
IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
|
||||||
IEEE80211_HW_SIGNAL_DBM |
|
IEEE80211_HW_SIGNAL_DBM;
|
||||||
IEEE80211_HW_NOISE_DBM;
|
|
||||||
|
|
||||||
if (modparam_ht) {
|
if (modparam_ht) {
|
||||||
ar->hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;
|
ar->hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;
|
||||||
|
|
|
@ -547,8 +547,7 @@ ath5k_pci_probe(struct pci_dev *pdev,
|
||||||
SET_IEEE80211_DEV(hw, &pdev->dev);
|
SET_IEEE80211_DEV(hw, &pdev->dev);
|
||||||
hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
|
hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
|
||||||
IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
|
IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
|
||||||
IEEE80211_HW_SIGNAL_DBM |
|
IEEE80211_HW_SIGNAL_DBM;
|
||||||
IEEE80211_HW_NOISE_DBM;
|
|
||||||
|
|
||||||
hw->wiphy->interface_modes =
|
hw->wiphy->interface_modes =
|
||||||
BIT(NL80211_IFTYPE_AP) |
|
BIT(NL80211_IFTYPE_AP) |
|
||||||
|
|
|
@ -4904,8 +4904,7 @@ static int b43_wireless_init(struct ssb_device *dev)
|
||||||
|
|
||||||
/* fill hw info */
|
/* fill hw info */
|
||||||
hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
|
hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
|
||||||
IEEE80211_HW_SIGNAL_DBM |
|
IEEE80211_HW_SIGNAL_DBM;
|
||||||
IEEE80211_HW_NOISE_DBM;
|
|
||||||
|
|
||||||
hw->wiphy->interface_modes =
|
hw->wiphy->interface_modes =
|
||||||
BIT(NL80211_IFTYPE_AP) |
|
BIT(NL80211_IFTYPE_AP) |
|
||||||
|
|
|
@ -3768,8 +3768,7 @@ static int b43legacy_wireless_init(struct ssb_device *dev)
|
||||||
|
|
||||||
/* fill hw info */
|
/* fill hw info */
|
||||||
hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
|
hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
|
||||||
IEEE80211_HW_SIGNAL_DBM |
|
IEEE80211_HW_SIGNAL_DBM;
|
||||||
IEEE80211_HW_NOISE_DBM;
|
|
||||||
hw->wiphy->interface_modes =
|
hw->wiphy->interface_modes =
|
||||||
BIT(NL80211_IFTYPE_AP) |
|
BIT(NL80211_IFTYPE_AP) |
|
||||||
BIT(NL80211_IFTYPE_STATION) |
|
BIT(NL80211_IFTYPE_STATION) |
|
||||||
|
|
|
@ -2653,7 +2653,6 @@ static int iwl_mac_setup_register(struct iwl_priv *priv)
|
||||||
|
|
||||||
/* Tell mac80211 our characteristics */
|
/* Tell mac80211 our characteristics */
|
||||||
hw->flags = IEEE80211_HW_SIGNAL_DBM |
|
hw->flags = IEEE80211_HW_SIGNAL_DBM |
|
||||||
IEEE80211_HW_NOISE_DBM |
|
|
||||||
IEEE80211_HW_AMPDU_AGGREGATION |
|
IEEE80211_HW_AMPDU_AGGREGATION |
|
||||||
IEEE80211_HW_SPECTRUM_MGMT;
|
IEEE80211_HW_SPECTRUM_MGMT;
|
||||||
|
|
||||||
|
|
|
@ -3872,7 +3872,6 @@ static int iwl3945_setup_mac(struct iwl_priv *priv)
|
||||||
|
|
||||||
/* Tell mac80211 our characteristics */
|
/* Tell mac80211 our characteristics */
|
||||||
hw->flags = IEEE80211_HW_SIGNAL_DBM |
|
hw->flags = IEEE80211_HW_SIGNAL_DBM |
|
||||||
IEEE80211_HW_NOISE_DBM |
|
|
||||||
IEEE80211_HW_SPECTRUM_MGMT;
|
IEEE80211_HW_SPECTRUM_MGMT;
|
||||||
|
|
||||||
if (!priv->cfg->broken_powersave)
|
if (!priv->cfg->broken_powersave)
|
||||||
|
|
|
@ -3981,8 +3981,8 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
|
||||||
|
|
||||||
hw->queues = MWL8K_TX_QUEUES;
|
hw->queues = MWL8K_TX_QUEUES;
|
||||||
|
|
||||||
/* Set rssi and noise values to dBm */
|
/* Set rssi values to dBm */
|
||||||
hw->flags |= IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_NOISE_DBM;
|
hw->flags |= IEEE80211_HW_SIGNAL_DBM;
|
||||||
hw->vif_data_size = sizeof(struct mwl8k_vif);
|
hw->vif_data_size = sizeof(struct mwl8k_vif);
|
||||||
hw->sta_data_size = sizeof(struct mwl8k_sta);
|
hw->sta_data_size = sizeof(struct mwl8k_sta);
|
||||||
|
|
||||||
|
|
|
@ -545,8 +545,7 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
|
||||||
IEEE80211_HW_SUPPORTS_PS |
|
IEEE80211_HW_SUPPORTS_PS |
|
||||||
IEEE80211_HW_PS_NULLFUNC_STACK |
|
IEEE80211_HW_PS_NULLFUNC_STACK |
|
||||||
IEEE80211_HW_BEACON_FILTER |
|
IEEE80211_HW_BEACON_FILTER |
|
||||||
IEEE80211_HW_REPORTS_TX_ACK_STATUS |
|
IEEE80211_HW_REPORTS_TX_ACK_STATUS;
|
||||||
IEEE80211_HW_NOISE_DBM;
|
|
||||||
|
|
||||||
dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
|
dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
|
||||||
BIT(NL80211_IFTYPE_ADHOC) |
|
BIT(NL80211_IFTYPE_ADHOC) |
|
||||||
|
|
|
@ -1291,7 +1291,6 @@ int wl1251_init_ieee80211(struct wl1251 *wl)
|
||||||
wl->hw->channel_change_time = 10000;
|
wl->hw->channel_change_time = 10000;
|
||||||
|
|
||||||
wl->hw->flags = IEEE80211_HW_SIGNAL_DBM |
|
wl->hw->flags = IEEE80211_HW_SIGNAL_DBM |
|
||||||
IEEE80211_HW_NOISE_DBM |
|
|
||||||
IEEE80211_HW_SUPPORTS_PS |
|
IEEE80211_HW_SUPPORTS_PS |
|
||||||
IEEE80211_HW_BEACON_FILTER |
|
IEEE80211_HW_BEACON_FILTER |
|
||||||
IEEE80211_HW_SUPPORTS_UAPSD;
|
IEEE80211_HW_SUPPORTS_UAPSD;
|
||||||
|
|
|
@ -2275,7 +2275,6 @@ int wl1271_init_ieee80211(struct wl1271 *wl)
|
||||||
wl->hw->max_listen_interval = wl->conf.conn.max_listen_interval;
|
wl->hw->max_listen_interval = wl->conf.conn.max_listen_interval;
|
||||||
|
|
||||||
wl->hw->flags = IEEE80211_HW_SIGNAL_DBM |
|
wl->hw->flags = IEEE80211_HW_SIGNAL_DBM |
|
||||||
IEEE80211_HW_NOISE_DBM |
|
|
||||||
IEEE80211_HW_BEACON_FILTER |
|
IEEE80211_HW_BEACON_FILTER |
|
||||||
IEEE80211_HW_SUPPORTS_PS |
|
IEEE80211_HW_SUPPORTS_PS |
|
||||||
IEEE80211_HW_SUPPORTS_UAPSD |
|
IEEE80211_HW_SUPPORTS_UAPSD |
|
||||||
|
|
|
@ -560,7 +560,6 @@ 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 (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)
|
||||||
|
@ -571,7 +570,6 @@ struct ieee80211_rx_status {
|
||||||
enum ieee80211_band band;
|
enum ieee80211_band band;
|
||||||
int freq;
|
int freq;
|
||||||
int signal;
|
int signal;
|
||||||
int noise __deprecated;
|
|
||||||
int antenna;
|
int antenna;
|
||||||
int rate_idx;
|
int rate_idx;
|
||||||
int flag;
|
int flag;
|
||||||
|
@ -934,10 +932,6 @@ enum ieee80211_tkip_key_type {
|
||||||
* one milliwatt. This is the preferred method since it is standardized
|
* one milliwatt. This is the preferred method since it is standardized
|
||||||
* between different devices. @max_signal does not need to be set.
|
* between different devices. @max_signal does not need to be set.
|
||||||
*
|
*
|
||||||
* @IEEE80211_HW_NOISE_DBM:
|
|
||||||
* Hardware can provide noise (radio interference) values in units dBm,
|
|
||||||
* decibel difference from one milliwatt.
|
|
||||||
*
|
|
||||||
* @IEEE80211_HW_SPECTRUM_MGMT:
|
* @IEEE80211_HW_SPECTRUM_MGMT:
|
||||||
* Hardware supports spectrum management defined in 802.11h
|
* Hardware supports spectrum management defined in 802.11h
|
||||||
* Measurement, Channel Switch, Quieting, TPC
|
* Measurement, Channel Switch, Quieting, TPC
|
||||||
|
@ -1001,7 +995,7 @@ enum ieee80211_hw_flags {
|
||||||
IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE = 1<<4,
|
IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE = 1<<4,
|
||||||
IEEE80211_HW_SIGNAL_UNSPEC = 1<<5,
|
IEEE80211_HW_SIGNAL_UNSPEC = 1<<5,
|
||||||
IEEE80211_HW_SIGNAL_DBM = 1<<6,
|
IEEE80211_HW_SIGNAL_DBM = 1<<6,
|
||||||
IEEE80211_HW_NOISE_DBM = 1<<7,
|
/* use this hole */
|
||||||
IEEE80211_HW_SPECTRUM_MGMT = 1<<8,
|
IEEE80211_HW_SPECTRUM_MGMT = 1<<8,
|
||||||
IEEE80211_HW_AMPDU_AGGREGATION = 1<<9,
|
IEEE80211_HW_AMPDU_AGGREGATION = 1<<9,
|
||||||
IEEE80211_HW_SUPPORTS_PS = 1<<10,
|
IEEE80211_HW_SUPPORTS_PS = 1<<10,
|
||||||
|
|
|
@ -80,8 +80,6 @@ ieee80211_rx_radiotap_len(struct ieee80211_local *local,
|
||||||
len += 8;
|
len += 8;
|
||||||
if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
|
if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
|
||||||
len += 1;
|
len += 1;
|
||||||
if (local->hw.flags & IEEE80211_HW_NOISE_DBM)
|
|
||||||
len += 1;
|
|
||||||
|
|
||||||
if (len & 1) /* padding for RX_FLAGS if necessary */
|
if (len & 1) /* padding for RX_FLAGS if necessary */
|
||||||
len++;
|
len++;
|
||||||
|
|
Loading…
Reference in a new issue