Use asserts as a suggestion

CODEOWNERS

@@ -0,0 +1,8 @@
+# CODEOWNERS for autoreview assigning in github
+
+# https://help.github.com/en/articles/about-code-owners#codeowners-syntax
+# Order is important; the last matching pattern takes the most
+# precedence.
+
+# Root folder
+*      @krish2718 @sr1dh48r @rlubos @sachinthegreen

src/common/ieee802_11_common.c

@@ -1556,15 +1556,15 @@ int supp_rates_11b_only(struct ieee802_11_elems *elems)
 		return 0;
 
 	for (i = 0; elems->supp_rates && i < elems->supp_rates_len; i++) {
-		if (is_11b(elems->supp_rates[i]))
+		if (is_11b(elems->supp_rates[i] & 0x7f))
 			num_11b++;
 		else
 			num_others++;
 	}
 
 	for (i = 0; elems->ext_supp_rates && i < elems->ext_supp_rates_len;
 	     i++) {
-		if (is_11b(elems->ext_supp_rates[i]))
+		if (is_11b(elems->ext_supp_rates[i] & 0x7f))
 			num_11b++;
 		else
 			num_others++;

src/common/wpa_ctrl.c

@@ -13,7 +13,9 @@
 #ifdef CONFIG_CTRL_IFACE_UNIX
 #include <sys/stat.h>
 #include <fcntl.h>
+#ifndef CONFIG_ZEPHYR
 #include <sys/un.h>
+#endif
 #include <unistd.h>
 #include <fcntl.h>
 #endif /* CONFIG_CTRL_IFACE_UNIX */
@@ -35,8 +37,7 @@
 #include "wpa_ctrl.h"
 #include "common.h"
 
-
-#if defined(CONFIG_CTRL_IFACE_UNIX) || defined(CONFIG_CTRL_IFACE_UDP)
+#if defined(CONFIG_CTRL_IFACE_UNIX) || defined(CONFIG_CTRL_IFACE_UDP) || defined(CONFIG_CTRL_IFACE_ZEPHYR)
 #define CTRL_IFACE_SOCKET
 #endif /* CONFIG_CTRL_IFACE_UNIX || CONFIG_CTRL_IFACE_UDP */
 
@@ -72,6 +73,9 @@ struct wpa_ctrl {
 #ifdef CONFIG_CTRL_IFACE_NAMED_PIPE
 	HANDLE pipe;
 #endif /* CONFIG_CTRL_IFACE_NAMED_PIPE */
+#ifdef CONFIG_CTRL_IFACE_ZEPHYR
+	int s;
+#endif /* CONFIG_CTRL_IFACE_ZEPHYR */
 };
 
 
@@ -579,6 +583,34 @@ int wpa_ctrl_request(struct wpa_ctrl *ctrl, const char *cmd, size_t cmd_len,
 }
 #endif /* CTRL_IFACE_SOCKET */
 
+#ifdef CONFIG_CTRL_IFACE_ZEPHYR
+struct wpa_ctrl * wpa_ctrl_open(const int sock)
+{
+	struct wpa_ctrl *ctrl;
+
+	if (sock < 0) {
+		wpa_printf(MSG_ERROR, "Invalid socket : %d\n", sock);
+		return NULL;
+	}
+
+	ctrl = os_zalloc(sizeof(*ctrl));
+	if (ctrl == NULL) {
+		wpa_printf(MSG_ERROR, "Failed to allocate memory: %d\n", sizeof(*ctrl));
+		return NULL;
+	}
+
+	/* We use one of the socketpair opened in ctrl_iface_zephyr.c */
+	ctrl->s = sock;
+
+	return ctrl;
+}
+
+void wpa_ctrl_close(struct wpa_ctrl *ctrl)
+{
+	close(ctrl->s);
+	os_free(ctrl);
+}
+#endif
 
 static int wpa_ctrl_attach_helper(struct wpa_ctrl *ctrl, int attach)
 {

src/common/wpa_ctrl.h

@@ -12,6 +12,8 @@
 #ifdef  __cplusplus
 extern "C" {
 #endif
+extern struct wpa_ctrl *ctrl_conn;
+extern char *ifname_prefix;
 
 /* wpa_supplicant control interface - fixed message prefixes */
 
@@ -476,6 +478,17 @@ enum wpa_vendor_elem_frame {
 
 /* wpa_supplicant/hostapd control interface access */
 
+#ifdef CONFIG_CTRL_IFACE_ZEPHYR
+/**
+ * wpa_ctrl_open - Open a control interface to wpa_supplicant/hostapd
+ * @sock: one of the pair of UNIX domain socket (socketpair)
+ * Returns: Pointer to abstract control interface data or %NULL on failure
+ *
+ * This function is used to open a control interface to wpa_supplicant/hostapd
+ * using a connected socketpair.
+ */
+struct wpa_ctrl * wpa_ctrl_open(const int sock);
+#else
 /**
  * wpa_ctrl_open - Open a control interface to wpa_supplicant/hostapd
  * @ctrl_path: Path for UNIX domain sockets; ignored if UDP sockets are used.
@@ -487,6 +500,7 @@ enum wpa_vendor_elem_frame {
  * interface need to use matching path configuration.
  */
 struct wpa_ctrl * wpa_ctrl_open(const char *ctrl_path);
+#endif
 
 /**
  * wpa_ctrl_open2 - Open a control interface to wpa_supplicant/hostapd
@@ -634,6 +648,8 @@ void wpa_ctrl_cleanup(void);
 char * wpa_ctrl_get_remote_ifname(struct wpa_ctrl *ctrl);
 #endif /* CONFIG_CTRL_IFACE_UDP */
 
+int wpa_ctrl_command(struct wpa_ctrl *ctrl, const char *cmd);
+int wpa_request(struct wpa_ctrl *ctrl, int argc, char *argv[]);
 
 #ifdef  __cplusplus
 }