diff --git a/include/nuttx/wireless/wireless.h b/include/nuttx/wireless/wireless.h
index 6ab0b0b3d11..74908e7350b 100644
--- a/include/nuttx/wireless/wireless.h
+++ b/include/nuttx/wireless/wireless.h
@@ -203,6 +203,22 @@
 
 #define IW_ESSID_MAX_SIZE   32
 
+/* Modes of operation */
+
+#define IW_MODE_AUTO        0    /* Let the driver decides */
+#define IW_MODE_ADHOC       1    /* Single cell network */
+#define IW_MODE_INFRA       2    /* Multi cell network, roaming, ... */
+#define IW_MODE_MASTER      3    /* Synchronisation master or Access Point */
+#define IW_MODE_REPEAT      4    /* Wireless Repeater (forwarder) */
+#define IW_MODE_SECOND      5    /* Secondary master/repeater (backup) */
+#define IW_MODE_MONITOR     6    /* Passive monitor (listen only) */
+#define IW_MODE_MESH        7    /* Mesh (IEEE 802.11s) network */
+
+/* Frequency flags */
+
+#define IW_FREQ_AUTO        0x00 /* Let the driver decides */
+#define IW_FREQ_FIXED       0x01 /* Force a specific value */
+
 /************************************************************************************
  * Public Types
  ************************************************************************************/
@@ -303,8 +319,8 @@ union iwreq_data
 
 struct iwreq
 {
-  char ifrn_name[IFNAMSIZ];    /* Interface name, e.g. "eth0" */
-  union iwreq_data u;          /* Data payload */
+  char ifrn_name[IFNAMSIZ]; /* Interface name, e.g. "eth0" */
+  union iwreq_data u;       /* Data payload */
 };
 
 #endif /* CONFIG_DRIVERS_WIRELESS */
diff --git a/sched/pthread/pthread_cancel.c b/sched/pthread/pthread_cancel.c
index e2cad60ebbf..20e6f838b73 100644
--- a/sched/pthread/pthread_cancel.c
+++ b/sched/pthread/pthread_cancel.c
@@ -150,9 +150,9 @@ int pthread_cancel(pthread_t thread)
    *
    * REVISIT: In this case, the clean-up callback will execute on the
    * thread of the caller of pthread cancel, not on the thread of
-   * the thread-to-be-canceled.  Is that an issue?  Presumably they
-   * are both within the same group and within the same process address
-   * space.
+   * the thread-to-be-canceled.  This is a problem when deferred
+   * cancellation is not supported because, for example, the clean-up
+   * function will be unable to unlock its own mutexes.
    */
 
   pthread_cleanup_popall(tcb);