Browse Source

hostapd: ubus: fix infinite loop when configuring RRM NR

The return-code was set, however it was never returned, nor was
the loop interrupted.

Signed-off-by: David Bauer <[email protected]>
David Bauer 5 years ago
parent
commit
d643b10a76

+ 1 - 1
package/network/services/hostapd/Makefile

@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
-PKG_RELEASE:=8
+PKG_RELEASE:=9
 
 PKG_SOURCE_URL:=http://w1.fi/hostap.git
 PKG_SOURCE_PROTO:=git

+ 1 - 2
package/network/services/hostapd/src/src/ap/ubus.c

@@ -849,7 +849,6 @@ hostapd_rrm_nr_set(struct ubus_context *ctx, struct ubus_object *obj,
 	struct blob_attr *tb_l[__NR_SET_LIST_MAX];
 	struct blob_attr *tb[ARRAY_SIZE(nr_e_policy)];
 	struct blob_attr *cur;
-	int ret = 0;
 	int rem;
 
 	hostapd_rrm_nr_enable(hapd);
@@ -888,7 +887,7 @@ hostapd_rrm_nr_set(struct ubus_context *ctx, struct ubus_object *obj,
 		continue;
 
 invalid:
-		ret = UBUS_STATUS_INVALID_ARGUMENT;
+		return UBUS_STATUS_INVALID_ARGUMENT;
 	}
 
 	return 0;