diff --git a/src/trans/umqtt_transport.c b/src/trans/umqtt_transport.c
index 6071938..46a7eb5 100644
--- a/src/trans/umqtt_transport.c
+++ b/src/trans/umqtt_transport.c
@@ -197,7 +197,7 @@ int umqtt_trans_connect(const char *uri, int *sock)
         goto exit;
     }
 
-    _ret = ioctlsocket(*sock, FIONBIO, 0);
+    _ret = ioctl(*sock, FIONBIO, 0);
     if (_ret < 0)
     {
         LOG_E(" iocontrol socket error!");
diff --git a/src/umqtt.c b/src/umqtt.c
index 238fdb4..6d018dd 100644
--- a/src/umqtt.c
+++ b/src/umqtt.c
@@ -582,8 +582,8 @@ static void umqtt_deliver_message(struct umqtt_client *client,
             {
                 p_subtop->callback(client, msg);
             }
+            }
         }
-    }
 }
 
 static int umqtt_readpacket(struct umqtt_client *client, unsigned char *buf, int len, int timeout)
@@ -885,7 +885,7 @@ static int umqtt_handle_readpacket(struct umqtt_client *client)
 
             _ret = rt_mq_send(client->msg_queue, &msg_ack, sizeof(struct umqtt_msg_ack));
             if (_ret != RT_EOK)
-            {
+            { 
                 _ret = UMQTT_SEND_FAILED;
                 goto exit;
             }
@@ -1393,7 +1393,7 @@ int umqtt_start(struct umqtt_client *client)
             set_uplink_recon_tick(client, UPLINK_LAST_TICK);
 
             rt_memset(&msg_ack, 0, sizeof(msg_ack));
-            if (RT_EOK == rt_mq_recv(client->msg_queue,
+            if ( sizeof(struct umqtt_msg_ack) == rt_mq_recv(client->msg_queue,
                                     &msg_ack, sizeof(struct umqtt_msg_ack),
                                     rt_tick_from_millisecond(client->mqtt_info.send_timeout * 1000)))
             {
@@ -1512,7 +1512,7 @@ int umqtt_publish(struct umqtt_client *client, enum umqtt_qos qos, const char *t
     _ret = UMQTT_OK;
     if (qos == UMQTT_QOS1)
     {
-        if (RT_EOK == rt_mq_recv(client->msg_queue,
+        if ( sizeof(struct umqtt_msg_ack) == rt_mq_recv(client->msg_queue,
                                 &msg_ack, sizeof(struct umqtt_msg_ack),
                                 rt_tick_from_millisecond(timeout)))
         {
@@ -1547,7 +1547,7 @@ int umqtt_publish(struct umqtt_client *client, enum umqtt_qos qos, const char *t
     }
     else if (qos == UMQTT_QOS2)
     {
-        if (RT_EOK == rt_mq_recv(client->msg_queue,
+        if ( sizeof(struct umqtt_msg_ack) == rt_mq_recv(client->msg_queue,
                                 &msg_ack, sizeof(struct umqtt_msg_ack),
                                 rt_tick_from_millisecond(timeout)))
         {
@@ -1603,7 +1603,7 @@ int umqtt_publish(struct umqtt_client *client, enum umqtt_qos qos, const char *t
         }
         _ret = UMQTT_OK;
 
-        if (RT_EOK == rt_mq_recv(client->msg_queue,
+        if ( sizeof(struct umqtt_msg_ack) == rt_mq_recv(client->msg_queue,
                                 &msg_ack, sizeof(struct umqtt_msg_ack),
                                 rt_tick_from_millisecond(timeout)))
         {
@@ -1717,10 +1717,10 @@ int umqtt_subscribe(struct umqtt_client *client, const char *topic, enum umqtt_q
 
         set_uplink_recon_tick(client, UPLINK_LAST_TICK);
 
-        rt_memset(&msg_ack, 0, sizeof(msg_ack));
-        if (RT_EOK == rt_mq_recv(client->msg_queue,
-                                &msg_ack, sizeof(struct umqtt_msg_ack),
-                                rt_tick_from_millisecond(client->mqtt_info.send_timeout * 1000)))
+        rt_memset(&msg_ack, 0, sizeof(msg_ack)); 
+        if ( sizeof(struct umqtt_msg_ack) ==  rt_mq_recv(client->msg_queue,
+                                                         &msg_ack, sizeof(struct umqtt_msg_ack),
+                                                         /*rt_tick_from_millisecond*/(client->mqtt_info.send_timeout * 1000)))
         {
             if (msg_ack.msg_type == UMQTT_TYPE_SUBACK)
             {
@@ -1816,8 +1816,8 @@ int umqtt_unsubscribe(struct umqtt_client *client, const char *topic)
 
                 set_uplink_recon_tick(client, UPLINK_LAST_TICK);
 
-                rt_memset(&msg_ack, 0, sizeof(msg_ack));
-                if (RT_EOK == rt_mq_recv(client->msg_queue,
+                rt_memset(&msg_ack, 0, sizeof(msg_ack)); 
+                if (sizeof(struct umqtt_msg_ack) == rt_mq_recv(client->msg_queue,
                                         &msg_ack, sizeof(struct umqtt_msg_ack),
                                         rt_tick_from_millisecond(client->mqtt_info.send_timeout * 1000)))
                 {