From 946b4e9b272209d0ed217eaf7c8ed46e5fb7194e Mon Sep 17 00:00:00 2001
From: Filip Matusiak <filip.matusiak@iopsys.eu>
Date: Fri, 28 Mar 2025 14:50:22 +0100
Subject: [PATCH] assoc ctrl: deprecate use of assoc_ctrllist in AP config
---
src/config.c | 20 --------------------
src/config.h | 4 +---
2 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/src/config.c b/src/config.c
index 5230858e4..277c0f73c 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1894,12 +1894,6 @@ void agent_config_dump(struct agent_config *cfg)
* pol->dump_config(pol, pol->policy);
*/
}
-
- x = NULL;
- dbg(" Assoc Ctrl Lists -------\n");
- list_for_each_entry(x, &n->assoc_ctrllist, list) {
- dbg(" mac: " MACFMT "\n", MAC2STR(x->macaddr));
- }
}
}
@@ -1940,8 +1934,6 @@ struct netif_apcfg *create_fronthaul_iface_config(struct agent_config *cfg,
list_add(&pol->list, &new->steer_policylist);
}
- INIT_LIST_HEAD(&new->assoc_ctrllist);
-
/* f->cfg = new; */
dbg("%s: %s netif_ap->cfg = %p\n", __func__, new->name, new);
@@ -2887,7 +2879,6 @@ static int agent_config_get_ap(struct agent_config *a,
AP_BAND,
AP_STEER,
AP_DEVICE,
- AP_ASSOC_CTRL,
AP_BTM_RETRY,
AP_BTM_RETRY_SECS,
AP_ASSOC_CTRL_SECS,
@@ -2909,7 +2900,6 @@ static int agent_config_get_ap(struct agent_config *a,
{ .name = "band", .type = UCI_TYPE_STRING },
{ .name = "steer", .type = UCI_TYPE_LIST },
{ .name = "device", .type = UCI_TYPE_STRING },
- { .name = "assoc_ctrl", .type = UCI_TYPE_LIST },
{ .name = "btm_retry", .type = UCI_TYPE_STRING },
{ .name = "btm_retry_secs", .type = UCI_TYPE_STRING },
{ .name = "assoc_ctrl_secs", .type = UCI_TYPE_STRING },
@@ -3003,16 +2993,6 @@ static int agent_config_get_ap(struct agent_config *a,
return -1;
}
- if (tb[AP_ASSOC_CTRL]) {
- struct uci_element *xi;
- uint8_t macaddr[ETH_ALEN];
-
- uci_foreach_element(&tb[AP_ASSOC_CTRL]->v.list, xi) {
- hwaddr_aton(xi->name, macaddr);
- stax_add_entry(&ap->assoc_ctrllist, macaddr);
- }
- }
-
if (tb[AP_BTM_RETRY])
ap->steer_btm_retry = atoi(tb[AP_BTM_RETRY]->v.string);
diff --git a/src/config.h b/src/config.h
index 7241d230d..eb56eb677 100644
--- a/src/config.h
+++ b/src/config.h
@@ -71,6 +71,7 @@ struct steer_policy {
struct stax {
uint8_t macaddr[6];
+
struct list_head list;
};
@@ -136,9 +137,6 @@ struct netif_apcfg {
/** ordered list of policies effective on per-bss interface */
struct list_head steer_policylist;
- /** STAs assoc controlled; list of stax structs */
- struct list_head assoc_ctrllist;
-
enum agent_steer_policy policy;
struct list_head list; /* link to next netif_config */
--
GitLab