policy: count kick total

[project/usteer.git] / policy.c

diff --git a/policy.c b/policy.c
index 9d62b780688efb82e35cf6300f8bb789b8e94843..3d21f324d4deade118cc1f853d4ffa25a5870d7f 100644 (file)
--- a/policy.c
+++ b/policy.c
@@ -378,6 +378,44 @@ usteer_roam_trigger_sm(struct usteer_local_node *ln, struct sta_info *si)
        return false;
 }
 
+bool usteer_policy_can_perform_roam(struct sta_info *si)
+{
+       /* Only trigger for connected STAs */
+       if (si->connected != STA_CONNECTED)
+               return false;
+
+       /* Skip on pending kick */
+       if (si->kick_time)
+               return false;
+
+       /* Skip on rejected transition */
+       if (si->bss_transition_response.status_code && current_time - si->bss_transition_response.timestamp < config.steer_reject_timeout)
+               return false;
+
+       /* Skip on previous kick attempt */
+       if (current_time - si->roam_kick < config.roam_trigger_interval)
+               return false;
+
+       /* Skip if connection is established shorter than the trigger-interval */
+       if (current_time - si->connected_since < config.roam_trigger_interval)
+               return false;
+       
+       return true;
+}
+
+static bool
+usteer_local_node_roam_sm_active(struct sta_info *si, int min_signal)
+{
+       if (!usteer_policy_can_perform_roam(si))
+               return false;
+
+       /* Signal has to be below scan / roam threshold */
+       if (si->signal >= min_signal)
+               return false;
+
+       return true;
+}
+
 static void
 usteer_local_node_roam_check(struct usteer_local_node *ln, struct uevent *ev)
 {
@@ -395,10 +433,7 @@ usteer_local_node_roam_check(struct usteer_local_node *ln, struct uevent *ev)
        min_signal = usteer_snr_to_signal(&ln->node, min_signal);
 
        list_for_each_entry(si, &ln->node.sta_info, node_list) {
-               if (si->connected != STA_CONNECTED || si->signal >= min_signal ||
-                       si->kick_time ||
-                       (si->bss_transition_response.status_code && current_time - si->bss_transition_response.timestamp < config.steer_reject_timeout) ||
-                   current_time - si->roam_kick < config.roam_trigger_interval) {
+               if (!usteer_local_node_roam_sm_active(si, min_signal)) {
                        usteer_roam_set_state(si, ROAM_TRIGGER_IDLE, ev);
                        continue;
                }
@@ -442,8 +477,6 @@ usteer_local_node_snr_kick(struct usteer_local_node *ln)
                if (si->below_min_snr <= min_count)
                        continue;
 
-               si->kick_count++;
-
                ev.type = UEV_SIGNAL_KICK;
                ev.threshold.cur = si->signal;
                ev.count = si->kick_count;