From 70abe8325cee248ac30150c81f390de8a70ecd39 Mon Sep 17 00:00:00 2001
From: Filip Matusiak <filip.matusiak@iopsys.eu>
Date: Wed, 11 May 2022 16:01:04 +0200
Subject: [PATCH] datalelements-2: fix steer method & trigger enums
---
src/cntlr.c | 2 +-
src/cntlr_ubus.c | 30 +++++++++++++++---------------
src/plugins/steer/rcpi/rcpi.c | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/cntlr.c b/src/cntlr.c
index e24f2563..78be3ebf 100644
--- a/src/cntlr.c
+++ b/src/cntlr.c
@@ -444,7 +444,7 @@ static int cntlr_steer_sta(struct controller *c, struct sta *s,
}
cntlr_update_sta_steer_counters(c, s->macaddr, s->bssid, to->bssid,
- METHOD_BTM_REQ, TRIGGER_LINK_QUALITY);
+ STEER_METHOD_BTM_REQ, STEER_TRIGGER_LINK_QUALITY);
send_cmdu(c, cmdu);
cmdu_free(cmdu);
diff --git a/src/cntlr_ubus.c b/src/cntlr_ubus.c
index 4f00f58a..01b24f14 100644
--- a/src/cntlr_ubus.c
+++ b/src/cntlr_ubus.c
@@ -637,11 +637,11 @@ static int cntlr_timers(struct ubus_context *ctx, struct ubus_object *obj,
const char *steer_method2str(enum steer_method type)
{
switch (type) {
- case METHOD_ASSOC_CTL:
+ case STEER_METHOD_ASSOC_CTL:
return "assoc_ctl";
- case METHOD_BTM_REQ:
+ case STEER_METHOD_BTM_REQ:
return "btm";
- case METHOD_ASYNC_BTM:
+ case STEER_METHOD_ASYNC_BTM:
return "async_btm";
}
return "unknown";
@@ -650,13 +650,13 @@ const char *steer_method2str(enum steer_method type)
const char *steer_trigger2str(enum steer_trigger type)
{
switch (type) {
- case TRIGGER_UNKNOWN:
+ case STEER_TRIGGER_UNKNOWN:
return "unknown";
- case TRIGGER_UTIL:
+ case STEER_TRIGGER_UTIL:
return "channel_util";
- case TRIGGER_LINK_QUALITY:
+ case STEER_TRIGGER_LINK_QUALITY:
return "link_quality";
- case TRIGGER_BK_UTIL:
+ case STEER_TRIGGER_BK_UTIL:
return "bk_link_util";
}
return "unknown";
@@ -1138,8 +1138,8 @@ static void cntlr_update_sta_steering_stats(struct controller *c, uint8_t *bssid
sta_id[i],
bssid,
target_bbsid[i],
- METHOD_BTM_REQ,
- TRIGGER_UNKNOWN);
+ STEER_METHOD_BTM_REQ,
+ STEER_TRIGGER_UNKNOWN);
}
/* Multiple STAs and single BSSID - one attempt per STA */
} else if (sta_nr > 0 && bssid_nr == 1) {
@@ -1148,8 +1148,8 @@ static void cntlr_update_sta_steering_stats(struct controller *c, uint8_t *bssid
sta_id[i],
bssid,
target_bbsid[0],
- METHOD_BTM_REQ,
- TRIGGER_UNKNOWN);
+ STEER_METHOD_BTM_REQ,
+ STEER_TRIGGER_UNKNOWN);
}
}
/* No STA provided, request applies to ALL associated STAs */
@@ -1162,8 +1162,8 @@ static void cntlr_update_sta_steering_stats(struct controller *c, uint8_t *bssid
s->macaddr,
bssid,
target_bbsid[0],
- METHOD_BTM_REQ,
- TRIGGER_UNKNOWN);
+ STEER_METHOD_BTM_REQ,
+ STEER_TRIGGER_UNKNOWN);
}
}
}
@@ -1174,8 +1174,8 @@ static void cntlr_update_sta_steering_stats(struct controller *c, uint8_t *bssid
sta_id[i],
bssid,
NULL,
- METHOD_BTM_REQ,
- TRIGGER_UNKNOWN);
+ STEER_METHOD_BTM_REQ,
+ STEER_TRIGGER_UNKNOWN);
}
}
}
diff --git a/src/plugins/steer/rcpi/rcpi.c b/src/plugins/steer/rcpi/rcpi.c
index 57c68db4..1c35d47a 100644
--- a/src/plugins/steer/rcpi/rcpi.c
+++ b/src/plugins/steer/rcpi/rcpi.c
@@ -38,7 +38,7 @@ int rcpi_steer(void *priv, struct steer_sta *s)
UNUSED(p); //TODO
s->verdict = STEER_VERDICT_UNDECIDED;
- s->reason = 2; //TRIGGER_LINK_QUALITY
+ s->reason = 2; //STEER_TRIGGER_LINK_QUALITY
if (list_empty(s->bcnlist))
return 0;
--
GitLab