4:41 p.m.
---
src/scan.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/scan.c b/src/scan.c
index 3c28eb7d..a4469f0e 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -50,9 +50,12 @@
#include "src/mpdu.h"
#include "src/scan.h"
-#define SCAN_MAX_INTERVAL 320
#define SCAN_INIT_INTERVAL 10
+/* User configurable options */
+static double RANK_5G_FACTOR;
+static uint32_t SCAN_MAX_INTERVAL;
+
static struct l_queue *scan_contexts;
static struct l_genl_family *nl80211;
@@ -1313,9 +1316,6 @@ static struct scan_bss *scan_parse_result(struct l_genl_msg *msg,
return bss;
}
-/* User configurable options */
-static double RANK_5G_FACTOR;
-
static void scan_bss_compute_rank(struct scan_bss *bss)
{
static const double RANK_RSNE_FACTOR = 1.2;
@@ -2215,6 +2215,13 @@ static int scan_init(void)
&RANK_5G_FACTOR))
RANK_5G_FACTOR = 1.0;
+ if (!l_settings_get_uint(config, "Scan",
"MaximumPeriodicScanInterval",
+ &SCAN_MAX_INTERVAL))
+ SCAN_MAX_INTERVAL = 300;
+
+ if (SCAN_MAX_INTERVAL > UINT16_MAX)
+ SCAN_MAX_INTERVAL = UINT16_MAX;
+
return 0;
}
--
2.30.0
4:41 p.m.
New subject: [PATCH 2/4] doc: describe MaximumPeriodicScanIntervalSetting
---
src/iwd.config.rst | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/iwd.config.rst b/src/iwd.config.rst
index b3c9491e..b5cfe9e7 100644
--- a/src/iwd.config.rst
+++ b/src/iwd.config.rst
@@ -293,6 +293,12 @@ No modification from defaults is normally required.
**iwd** from issuing the periodic scans for the available networks while
disconnected. The behavior of the user-initiated scans isn't affected.
The periodic scan is enabled by default.
+
+ * - MaximumPeriodicScanInterval
+ - Values: unsigned int value in seconds (default: **300**)
+
+ The maximum periodic scan interval.
+
* - DisableRoamingScan
- Values: true, **false**
--
2.30.0
4:41 p.m.
New subject: [PATCH 3/4] scan: add InitialPeriodicScanInterval setting
---
src/scan.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/scan.c b/src/scan.c
index a4469f0e..82e6a2ae 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -50,11 +50,10 @@
#include "src/mpdu.h"
#include "src/scan.h"
-#define SCAN_INIT_INTERVAL 10
-
/* User configurable options */
static double RANK_5G_FACTOR;
static uint32_t SCAN_MAX_INTERVAL;
+static uint32_t SCAN_INIT_INTERVAL;
static struct l_queue *scan_contexts;
@@ -2215,6 +2214,13 @@ static int scan_init(void)
&RANK_5G_FACTOR))
RANK_5G_FACTOR = 1.0;
+ if (!l_settings_get_uint(config, "Scan",
"InitialPeriodicScanInterval",
+ &SCAN_INIT_INTERVAL))
+ SCAN_INIT_INTERVAL = 10;
+
+ if (SCAN_INIT_INTERVAL > UINT16_MAX)
+ SCAN_INIT_INTERVAL = UINT16_MAX;
+
if (!l_settings_get_uint(config, "Scan",
"MaximumPeriodicScanInterval",
&SCAN_MAX_INTERVAL))
SCAN_MAX_INTERVAL = 300;
--
2.30.0
4:41 p.m.
New subject: [PATCH 4/4] doc: describe InitialPeriodicScanInterval setting
---
src/iwd.config.rst | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/iwd.config.rst b/src/iwd.config.rst
index b5cfe9e7..478bd616 100644
--- a/src/iwd.config.rst
+++ b/src/iwd.config.rst
@@ -294,6 +294,11 @@ No modification from defaults is normally required.
disconnected. The behavior of the user-initiated scans isn't affected.
The periodic scan is enabled by default.
+ * - InitialPeriodicScanInterval
+ - Values: unsigned int value in seconds (default: **10**)
+
+ The initial periodic scan interval upon disconnect.
+
* - MaximumPeriodicScanInterval
- Values: unsigned int value in seconds (default: **300**)
--
2.30.0
460
days inactive
460
days old
4 comments
2 participants
participants (2)
-
Alvin Šipraga -
Denis Kenzior