uqmi: improve response detection

Create a helper which checks the flags depending on the service
indicated in the received message, as the response flag is not the same
for the CTL service and the other services. This avoids considering
a CTL indication as a valid response.

Also use a mask in order to check the flags, as they are a bitmap.

Signed-off-by: Jean Thomas <jean.thomas@wifirst.fr>

diff --git a/dev.c b/dev.c
index bd1020790f844fd364fd753135acd8f53f34d996..2d1597c07cd2424140d2063fafbf2aa9dbe63493 100644 (file)
--- a/dev.c
+++ b/dev.c
@@ -62,6 +62,20 @@ qmi_get_service_idx(QmiService svc)
        return -1;
 }
 
+static bool qmi_message_is_response(struct qmi_msg *msg)
+{
+       if (msg->qmux.service == QMI_SERVICE_CTL) {
+               if (msg->flags & QMI_CTL_FLAG_RESPONSE)
+                       return true;
+       }
+       else {
+               if (msg->flags & QMI_SERVICE_FLAG_RESPONSE)
+                       return true;
+       }
+
+       return false;
+}
+
 static void __qmi_request_complete(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg)
 {
        void *tlv_buf;
@@ -96,7 +110,7 @@ static void qmi_process_msg(struct qmi_dev *qmi, struct qmi_msg *msg)
        struct qmi_request *req;
        uint16_t tid;
 
-       if (msg->flags != QMI_CTL_FLAG_RESPONSE && msg->flags != QMI_SERVICE_FLAG_RESPONSE)
+       if (!qmi_message_is_response(msg))
                return;
 
        if (msg->qmux.service == QMI_SERVICE_CTL)