5 files changed, 11 insertions, 28 deletions

diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index a611ad857983..651807dfb508 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -967,7 +967,7 @@ struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf)
         hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &mac->band;
 
         hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
-                    IEEE80211_HW_SIGNAL_DB;
+                    IEEE80211_HW_SIGNAL_UNSPEC;
 
         hw->wiphy->interface_modes =
                 BIT(NL80211_IFTYPE_MESH_POINT) |
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index e2144f0e8728..409e2c69269d 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -860,11 +860,6 @@ enum ieee80211_tkip_key_type {
  *      expect values between 0 and @max_signal.
  *      If possible please provide dB or dBm instead.
  *
- * @IEEE80211_HW_SIGNAL_DB:
- *      Hardware gives signal values in dB, decibel difference from an
- *      arbitrary, fixed reference. We expect values between 0 and @max_signal.
- *      If possible please provide dBm instead.
- *
  * @IEEE80211_HW_SIGNAL_DBM:
  *      Hardware gives signal values in dBm, decibel difference from
  *      one milliwatt. This is the preferred method since it is standardized
@@ -900,15 +895,14 @@ enum ieee80211_hw_flags {
         IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE          = 1<<3,
         IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE      = 1<<4,
         IEEE80211_HW_SIGNAL_UNSPEC                      = 1<<5,
-        IEEE80211_HW_SIGNAL_DB                          = 1<<6,
-        IEEE80211_HW_SIGNAL_DBM                         = 1<<7,
-        IEEE80211_HW_NOISE_DBM                          = 1<<8,
-        IEEE80211_HW_SPECTRUM_MGMT                      = 1<<9,
-        IEEE80211_HW_AMPDU_AGGREGATION                  = 1<<10,
-        IEEE80211_HW_SUPPORTS_PS                        = 1<<11,
-        IEEE80211_HW_PS_NULLFUNC_STACK                  = 1<<12,
-        IEEE80211_HW_SUPPORTS_DYNAMIC_PS                = 1<<13,
-        IEEE80211_HW_MFP_CAPABLE                        = 1<<14,
+        IEEE80211_HW_SIGNAL_DBM                         = 1<<6,
+        IEEE80211_HW_NOISE_DBM                          = 1<<7,
+        IEEE80211_HW_SPECTRUM_MGMT                      = 1<<8,
+        IEEE80211_HW_AMPDU_AGGREGATION                  = 1<<9,
+        IEEE80211_HW_SUPPORTS_PS                        = 1<<10,
+        IEEE80211_HW_PS_NULLFUNC_STACK                  = 1<<11,
+        IEEE80211_HW_SUPPORTS_DYNAMIC_PS                = 1<<12,
+        IEEE80211_HW_MFP_CAPABLE                        = 1<<13,
 };
 
 /**
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index a109c06e8e4e..7247b303e966 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -884,7 +884,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
         local->hw.conf.listen_interval = local->hw.max_listen_interval;
 
         local->wstats_flags |= local->hw.flags & (IEEE80211_HW_SIGNAL_UNSPEC |
-                                                  IEEE80211_HW_SIGNAL_DB |
                                                   IEEE80211_HW_SIGNAL_DBM) ?
                                IW_QUAL_QUAL_UPDATED : IW_QUAL_QUAL_INVALID;
         local->wstats_flags |= local->hw.flags & IEEE80211_HW_NOISE_DBM ?
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 1a59382976e6..8e8ddbfcd236 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -86,8 +86,7 @@ ieee80211_rx_radiotap_len(struct ieee80211_local *local,
 
         if (status->flag & RX_FLAG_TSFT)
                 len += 8;
-        if (local->hw.flags & IEEE80211_HW_SIGNAL_DB ||
-            local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
+        if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
                 len += 1;
         if (local->hw.flags & IEEE80211_HW_NOISE_DBM)
                 len += 1;
@@ -199,14 +198,6 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
         *pos = status->antenna;
         pos++;
 
-        /* IEEE80211_RADIOTAP_DB_ANTSIGNAL */
-        if (local->hw.flags & IEEE80211_HW_SIGNAL_DB) {
-                *pos = status->signal;
-                rthdr->it_present |=
-                        cpu_to_le32(1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL);
-                pos++;
-        }
-
         /* IEEE80211_RADIOTAP_DB_ANTNOISE is not used */
 
         /* IEEE80211_RADIOTAP_RX_FLAGS */
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 5c88b8246bbb..bad1cfbfdf18 100644
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -173,8 +173,7 @@ static int ieee80211_ioctl_giwrange(struct net_device *dev,
         range->num_encoding_sizes = 2;
         range->max_encoding_tokens = NUM_DEFAULT_KEYS;
 
-        if (local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC ||
-            local->hw.flags & IEEE80211_HW_SIGNAL_DB)
+        if (local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)
                 range->max_qual.level = local->hw.max_signal;
         else if  (local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
                 range->max_qual.level = -110;