diff --git a/gitlab-ci/install-dependencies.sh b/gitlab-ci/install-dependencies.sh index 8f0316baa22424664b27ea6b62617d05665cda57..15e4610d2759fe114e0fb1eed63c7dcccb6ed412 100755 --- a/gitlab-ci/install-dependencies.sh +++ b/gitlab-ci/install-dependencies.sh @@ -11,7 +11,7 @@ cd /opt/dev rm -fr easy-soc-libs git clone https://dev.iopsys.eu/iopsys/easy-soc-libs.git cd easy-soc-libs -git checkout 784d14ce59f7d11d8fa24c777ffa41d0c5a65c47 +git checkout 93fc7326bfa0c593282243a960c3c32a7ebba6d8 cd libeasy make CFLAGS+="-I/usr/include/libnl3" mkdir -p /usr/include/easy diff --git a/wifimngr.c b/wifimngr.c index 8ffdd16228bf80352fb16c05b603e324a1bee4da..7504c79f1a277788637771afd324da5bb933831f 100644 --- a/wifimngr.c +++ b/wifimngr.c @@ -915,6 +915,23 @@ static void wifi_print_radio_supp_bw(struct blob_buf *bb, blobmsg_close_array(bb, a); } +static void wifi_print_radio_cac_methods(struct blob_buf *bb, + uint32_t cac_methods) +{ + void *a; + + a = blobmsg_open_array(bb, "cac_methods"); + if (cac_methods & BIT(WIFI_CAC_CONTINUOUS)) + blobmsg_add_string(bb, "", "continous"); + if (cac_methods & BIT(WIFI_CAC_DEDICATED)) + blobmsg_add_string(bb, "", "continous-dedicated"); + if (cac_methods & BIT(WIFI_CAC_MIMO_REDUCED)) + blobmsg_add_string(bb, "", "mimo-reduced"); + if (cac_methods & BIT(WIFI_CAC_TIME_SLICED)) + blobmsg_add_string(bb, "", "time-sliced"); + blobmsg_close_array(bb, a); +} + int wl_radio_status(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) @@ -1019,6 +1036,7 @@ int wl_radio_status(struct ubus_context *ctx, struct ubus_object *obj, wifi_print_radio_supp_bands(&bb, radio.supp_band); wifi_print_radio_supp_std(&bb, radio.supp_std); wifi_print_radio_supp_bw(&bb, radio.supp_bw); + wifi_print_radio_cac_methods(&bb, radio.cac_methods); c = blobmsg_open_array(&bb, "supp_rates"); for (i = 0; i < 32 && radio.supp_rates[i] != 0; i++) {