cfg80211: clean up signal type

It wasn't a good idea to make the signal type a per-BSS option,
although then it is closer to the actual value. Move it to be
a per-wiphy setting, update mac80211 to match.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

4 files changed, 18 insertions, 21 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index fce9d08986e..f38db4d37e5 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -861,6 +861,11 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
         /* mac80211 always supports monitor */
         local->hw.wiphy->interface_modes |= BIT(NL80211_IFTYPE_MONITOR);
 
+        if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
+                local->hw.wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
+        else if (local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)
+                local->hw.wiphy->signal_type = CFG80211_SIGNAL_TYPE_UNSPEC;
+
         result = wiphy_register(local->hw.wiphy);
         if (result < 0)
                 goto fail_wiphy_register;
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index c063f820426..23f4de27474 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -63,20 +63,15 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
 {
         struct ieee80211_bss *bss;
         int clen;
-        enum cfg80211_signal_type sigtype = CFG80211_SIGNAL_TYPE_NONE;
         s32 signal = 0;
 
-        if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM) {
-                sigtype = CFG80211_SIGNAL_TYPE_MBM;
+        if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
                 signal = rx_status->signal * 100;
-        } else if (local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC) {
-                sigtype = CFG80211_SIGNAL_TYPE_UNSPEC;
+        else if (local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)
                 signal = (rx_status->signal * 100) / local->hw.max_signal;
-        }
 
         bss = (void *)cfg80211_inform_bss_frame(local->hw.wiphy, channel,
-                                                mgmt, len, signal, sigtype,
-                                                GFP_ATOMIC);
+                                                mgmt, len, signal, GFP_ATOMIC);
 
         if (!bss)
                 return NULL;
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 245fddcc77c..a7e751edc73 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -2457,7 +2457,7 @@ static int nl80211_send_bss(struct sk_buff *msg, u32 pid, u32 seq, int flags,
         NLA_PUT_U16(msg, NL80211_BSS_CAPABILITY, res->capability);
         NLA_PUT_U32(msg, NL80211_BSS_FREQUENCY, res->channel->center_freq);
 
-        switch (res->signal_type) {
+        switch (rdev->wiphy.signal_type) {
         case CFG80211_SIGNAL_TYPE_MBM:
                 NLA_PUT_U32(msg, NL80211_BSS_SIGNAL_MBM, res->signal);
                 break;
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 01c136d98c5..60600657b65 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -370,7 +370,6 @@ cfg80211_bss_update(struct cfg80211_registered_device *dev,
                 found->pub.beacon_interval = res->pub.beacon_interval;
                 found->pub.tsf = res->pub.tsf;
                 found->pub.signal = res->pub.signal;
-                found->pub.signal_type = res->pub.signal_type;
                 found->pub.capability = res->pub.capability;
                 found->ts = res->ts;
                 kref_put(&res->ref, bss_release);
@@ -392,8 +391,7 @@ struct cfg80211_bss *
 cfg80211_inform_bss_frame(struct wiphy *wiphy,
                           struct ieee80211_channel *channel,
                           struct ieee80211_mgmt *mgmt, size_t len,
-                          s32 signal, enum cfg80211_signal_type sigtype,
-                          gfp_t gfp)
+                          s32 signal, gfp_t gfp)
 {
         struct cfg80211_internal_bss *res;
         size_t ielen = len - offsetof(struct ieee80211_mgmt,
@@ -401,7 +399,7 @@ cfg80211_inform_bss_frame(struct wiphy *wiphy,
         bool overwrite;
         size_t privsz = wiphy->bss_priv_size;
 
-        if (WARN_ON(sigtype == NL80211_BSS_SIGNAL_UNSPEC &&
+        if (WARN_ON(wiphy->signal_type == NL80211_BSS_SIGNAL_UNSPEC &&
                     (signal < 0 || signal > 100)))
                 return NULL;
 
@@ -415,7 +413,6 @@ cfg80211_inform_bss_frame(struct wiphy *wiphy,
 
         memcpy(res->pub.bssid, mgmt->bssid, ETH_ALEN);
         res->pub.channel = channel;
-        res->pub.signal_type = sigtype;
         res->pub.signal = signal;
         res->pub.tsf = le64_to_cpu(mgmt->u.probe_resp.timestamp);
         res->pub.beacon_interval = le16_to_cpu(mgmt->u.probe_resp.beacon_int);
@@ -607,9 +604,9 @@ static inline unsigned int elapsed_jiffies_msecs(unsigned long start)
 }
 
 static char *
-ieee80211_bss(struct iw_request_info *info,
-                      struct cfg80211_internal_bss *bss,
-                      char *current_ev, char *end_buf)
+ieee80211_bss(struct wiphy *wiphy, struct iw_request_info *info,
+              struct cfg80211_internal_bss *bss, char *current_ev,
+              char *end_buf)
 {
         struct iw_event iwe;
         u8 *buf, *cfg, *p;
@@ -638,13 +635,13 @@ ieee80211_bss(struct iw_request_info *info,
         current_ev = iwe_stream_add_event(info, current_ev, end_buf, &iwe,
                                           IW_EV_FREQ_LEN);
 
-        if (bss->pub.signal_type != CFG80211_SIGNAL_TYPE_NONE) {
+        if (wiphy->signal_type != CFG80211_SIGNAL_TYPE_NONE) {
                 memset(&iwe, 0, sizeof(iwe));
                 iwe.cmd = IWEVQUAL;
                 iwe.u.qual.updated = IW_QUAL_LEVEL_UPDATED |
                                      IW_QUAL_NOISE_INVALID |
                                      IW_QUAL_QUAL_UPDATED;
-                switch (bss->pub.signal_type) {
+                switch (wiphy->signal_type) {
                 case CFG80211_SIGNAL_TYPE_MBM:
                         sig = bss->pub.signal / 100;
                         iwe.u.qual.level = sig;
@@ -823,8 +820,8 @@ static int ieee80211_scan_results(struct cfg80211_registered_device *dev,
                         spin_unlock_bh(&dev->bss_lock);
                         return -E2BIG;
                 }
-                current_ev = ieee80211_bss(info, bss,
-                                                   current_ev, end_buf);
+                current_ev = ieee80211_bss(&dev->wiphy, info, bss,
+                                           current_ev, end_buf);
         }
         spin_unlock_bh(&dev->bss_lock);
         return current_ev - buf;