bgscan: Add new channel condition parameters to signal change events

bgscan modules can potentially get a richer feel for the channel
condition and make better choices about scan/no-scan and roam/no-roam.

diff --git a/wpa_supplicant/bgscan.c b/wpa_supplicant/bgscan.c
index e76e954532066333064a67083e9847ec168054e7..56618308009b78650e39d816cfbf506e9967b88d 100644 (file)
--- a/wpa_supplicant/bgscan.c
+++ b/wpa_supplicant/bgscan.c
@@ -112,9 +112,12 @@ void bgscan_notify_beacon_loss(struct wpa_supplicant *wpa_s)
 
 
 void bgscan_notify_signal_change(struct wpa_supplicant *wpa_s, int above,
-                                int current_signal)
+                                int current_signal, int current_noise,
+                                int current_txrate)
 {
        if (wpa_s->bgscan && wpa_s->bgscan_priv)
                wpa_s->bgscan->notify_signal_change(wpa_s->bgscan_priv, above,
-                                                   current_signal);
+                                                   current_signal,
+                                                   current_noise,
+                                                   current_txrate);
 }

diff --git a/wpa_supplicant/bgscan.h b/wpa_supplicant/bgscan.h
index 9f2ba2f4f82cdee446bb26e06d355a9a50d3b478..ae94a48e69ef6d093d89549d9773531fdd2bdb50 100644 (file)
--- a/wpa_supplicant/bgscan.h
+++ b/wpa_supplicant/bgscan.h
@@ -28,7 +28,9 @@ struct bgscan_ops {
        int (*notify_scan)(void *priv, struct wpa_scan_results *scan_res);
        void (*notify_beacon_loss)(void *priv);
        void (*notify_signal_change)(void *priv, int above,
-                                    int current_signal);
+                                    int current_signal,
+                                    int current_noise,
+                                    int current_txrate);
 };
 
 #ifdef CONFIG_BGSCAN
@@ -39,7 +41,8 @@ int bgscan_notify_scan(struct wpa_supplicant *wpa_s,
                       struct wpa_scan_results *scan_res);
 void bgscan_notify_beacon_loss(struct wpa_supplicant *wpa_s);
 void bgscan_notify_signal_change(struct wpa_supplicant *wpa_s, int above,
-                                int current_signal);
+                                int current_signal, int current_noise,
+                                int current_txrate);
 
 #else /* CONFIG_BGSCAN */
 
@@ -64,7 +67,9 @@ static inline void bgscan_notify_beacon_loss(struct wpa_supplicant *wpa_s)
 }
 
 static inline void bgscan_notify_signal_change(struct wpa_supplicant *wpa_s,
-                                              int above, int current_signal)
+                                              int above, int current_signal,
+                                              int current_noise,
+                                              int current_txrate)
 {
 }
 

diff --git a/wpa_supplicant/bgscan_learn.c b/wpa_supplicant/bgscan_learn.c
index 492ce380ef54bebb57832bcf81d5bae0a78caece..ee79511cbdf742ded5b41da99d56230c52d4f68a 100644 (file)
--- a/wpa_supplicant/bgscan_learn.c
+++ b/wpa_supplicant/bgscan_learn.c
@@ -556,7 +556,9 @@ static void bgscan_learn_notify_beacon_loss(void *priv)
 
 
 static void bgscan_learn_notify_signal_change(void *priv, int above,
-                                             int current_signal)
+                                             int current_signal,
+                                             int current_noise,
+                                             int current_txrate)
 {
        struct bgscan_learn_data *data = priv;
        int scan = 0;
@@ -567,7 +569,9 @@ static void bgscan_learn_notify_signal_change(void *priv, int above,
                return;
 
        wpa_printf(MSG_DEBUG, "bgscan learn: signal level changed "
-                  "(above=%d current_signal=%d)", above, current_signal);
+                  "(above=%d current_signal=%d current_noise=%d "
+                  "current_txrate=%d)", above, current_signal,
+                  current_noise, current_txrate);
        if (data->scan_interval == data->long_interval && !above) {
                wpa_printf(MSG_DEBUG, "bgscan learn: Start using short bgscan "
                           "interval");

diff --git a/wpa_supplicant/bgscan_simple.c b/wpa_supplicant/bgscan_simple.c
index 6325d731266b3d172bebace641697378d9fae6cd..409d9ceaead008d6fee6bf5ba7fadf42d814533a 100644 (file)
--- a/wpa_supplicant/bgscan_simple.c
+++ b/wpa_supplicant/bgscan_simple.c
@@ -177,7 +177,9 @@ static void bgscan_simple_notify_beacon_loss(void *priv)
 
 
 static void bgscan_simple_notify_signal_change(void *priv, int above,
-                                              int current_signal)
+                                              int current_signal,
+                                              int current_noise,
+                                              int current_txrate)
 {
        struct bgscan_simple_data *data = priv;
        int scan = 0;
@@ -188,7 +190,9 @@ static void bgscan_simple_notify_signal_change(void *priv, int above,
                return;
 
        wpa_printf(MSG_DEBUG, "bgscan simple: signal level changed "
-                  "(above=%d current_signal=%d)", above, current_signal);
+                  "(above=%d current_signal=%d current_noise=%d "
+                  "current_txrate=%d))", above, current_signal,
+                  current_noise, current_txrate);
        if (data->scan_interval == data->long_interval && !above) {
                wpa_printf(MSG_DEBUG, "bgscan simple: Start using short "
                           "bgscan interval");

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index e9dea1510a35fae9ccb37431e16f8452004c9b40..602f992c21adf8453b918feed5c01d86444dc42f 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1803,7 +1803,9 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
        case EVENT_SIGNAL_CHANGE:
                bgscan_notify_signal_change(
                        wpa_s, data->signal_change.above_threshold,
-                       data->signal_change.current_signal);
+                       data->signal_change.current_signal,
+                       data->signal_change.current_noise,
+                       data->signal_change.current_txrate);
                break;
        case EVENT_INTERFACE_ENABLED:
                wpa_printf(MSG_DEBUG, "Interface was enabled");