mac80211: Add set_cqm_rssi_range_config

Support .set_cqm_rssi_range_config if the beacons are available for
processing in mac80211.  There's no reason that this couldn't be
offloaded by mac80211-based drivers but there's no driver method for
that added in this patch.

Signed-off-by: Andrew Zaborowski <andrew.zaborowski@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index a3bab3c5ecfb302e5df2d9e5d5ec36e2c368ef9b..1a26a375feb86e0222c7fdb3ae12b7ee2729dc96 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -501,6 +501,10 @@ struct ieee80211_mu_group_data {
  *     implies disabled. As with the cfg80211 callback, a change here should
  *     cause an event to be sent indicating where the current value is in
  *     relation to the newly configured threshold.
+ * @cqm_rssi_low: Connection quality monitor RSSI lower threshold, a zero value
+ *     implies disabled.  This is an alternative mechanism to the single
+ *     threshold event and can't be enabled simultaneously with it.
+ * @cqm_rssi_high: Connection quality monitor RSSI upper threshold.
  * @cqm_rssi_hyst: Connection quality monitor RSSI hysteresis
  * @arp_addr_list: List of IPv4 addresses for hardware ARP filtering. The
  *     may filter ARP queries targeted for other addresses than listed here.
@@ -553,6 +557,8 @@ struct ieee80211_bss_conf {
        u16 ht_operation_mode;
        s32 cqm_rssi_thold;
        u32 cqm_rssi_hyst;
+       s32 cqm_rssi_low;
+       s32 cqm_rssi_high;
        struct cfg80211_chan_def chandef;
        struct ieee80211_mu_group_data mu_group;
        __be32 arp_addr_list[IEEE80211_BSS_ARP_ADDR_LIST_LEN];

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index ac879bb17870d4602fd151504f68d26c21eeac9b..9c7490cb2243dd36d4b79786a8baf1135f483990 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2630,6 +2630,33 @@ static int ieee80211_set_cqm_rssi_config(struct wiphy *wiphy,
 
        bss_conf->cqm_rssi_thold = rssi_thold;
        bss_conf->cqm_rssi_hyst = rssi_hyst;
+       bss_conf->cqm_rssi_low = 0;
+       bss_conf->cqm_rssi_high = 0;
+       sdata->u.mgd.last_cqm_event_signal = 0;
+
+       /* tell the driver upon association, unless already associated */
+       if (sdata->u.mgd.associated &&
+           sdata->vif.driver_flags & IEEE80211_VIF_SUPPORTS_CQM_RSSI)
+               ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_CQM);
+
+       return 0;
+}
+
+static int ieee80211_set_cqm_rssi_range_config(struct wiphy *wiphy,
+                                              struct net_device *dev,
+                                              s32 rssi_low, s32 rssi_high)
+{
+       struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+       struct ieee80211_vif *vif = &sdata->vif;
+       struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
+
+       if (sdata->vif.driver_flags & IEEE80211_VIF_BEACON_FILTER)
+               return -EOPNOTSUPP;
+
+       bss_conf->cqm_rssi_low = rssi_low;
+       bss_conf->cqm_rssi_high = rssi_high;
+       bss_conf->cqm_rssi_thold = 0;
+       bss_conf->cqm_rssi_hyst = 0;
        sdata->u.mgd.last_cqm_event_signal = 0;
 
        /* tell the driver upon association, unless already associated */
@@ -3639,6 +3666,7 @@ const struct cfg80211_ops mac80211_config_ops = {
        .mgmt_tx = ieee80211_mgmt_tx,
        .mgmt_tx_cancel_wait = ieee80211_mgmt_tx_cancel_wait,
        .set_cqm_rssi_config = ieee80211_set_cqm_rssi_config,
+       .set_cqm_rssi_range_config = ieee80211_set_cqm_rssi_range_config,
        .mgmt_frame_register = ieee80211_mgmt_frame_register,
        .set_antenna = ieee80211_set_antenna,
        .get_antenna = ieee80211_get_antenna,

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 6e90301154d5a6ba4a7e9bb612ac8243cf09a23c..23986934d7af256f02f126e89d5d6fd028502f4a 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3430,6 +3430,30 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
                }
        }
 
+       if (bss_conf->cqm_rssi_low &&
+           ifmgd->count_beacon_signal >= IEEE80211_SIGNAL_AVE_MIN_COUNT) {
+               int sig = -ewma_beacon_signal_read(&ifmgd->ave_beacon_signal);
+               int last_event = ifmgd->last_cqm_event_signal;
+               int low = bss_conf->cqm_rssi_low;
+               int high = bss_conf->cqm_rssi_high;
+
+               if (sig < low &&
+                   (last_event == 0 || last_event >= low)) {
+                       ifmgd->last_cqm_event_signal = sig;
+                       ieee80211_cqm_rssi_notify(
+                               &sdata->vif,
+                               NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW,
+                               sig, GFP_KERNEL);
+               } else if (sig > high &&
+                          (last_event == 0 || last_event <= high)) {
+                       ifmgd->last_cqm_event_signal = sig;
+                       ieee80211_cqm_rssi_notify(
+                               &sdata->vif,
+                               NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH,
+                               sig, GFP_KERNEL);
+               }
+       }
+
        if (ifmgd->flags & IEEE80211_STA_CONNECTION_POLL) {
                mlme_dbg_ratelimited(sdata,
                                     "cancelling AP probe due to a received beacon\n");