[PATCH] ath9k_htc: check seq number instead of cmd id for timeout

[Fred Chou]

From: Fred Chou <fred.chou...@gmail.com>

As the driver may send multiple wmi commands with identical cmd id,
it is more robust to check seq number for timeout instead.

Signed-off-by: Fred Chou <fred.chou...@gmail.com>
---
 drivers/net/wireless/ath/ath9k/wmi.c | 12 ++++++------
 drivers/net/wireless/ath/ath9k/wmi.h |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/wmi.c 
b/drivers/net/wireless/ath/ath9k/wmi.c
index 65c8894..aba909f 100644
--- a/drivers/net/wireless/ath/ath9k/wmi.c
+++ b/drivers/net/wireless/ath/ath9k/wmi.c
@@ -224,7 +224,7 @@ static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff 
*skb,
 
        /* Check if there has been a timeout. */
        spin_lock(&wmi->wmi_lock);
-       if (cmd_id != wmi->last_cmd_id) {
+       if (be16_to_cpu(hdr->seq_no) != wmi->last_seq_id) {
                spin_unlock(&wmi->wmi_lock);
                goto free_skb;
        }
@@ -272,11 +272,16 @@ static int ath9k_wmi_cmd_issue(struct wmi *wmi,
                               enum wmi_cmd_id cmd, u16 len)
 {
        struct wmi_cmd_hdr *hdr;
+       unsigned long flags;
 
        hdr = (struct wmi_cmd_hdr *) skb_push(skb, sizeof(struct wmi_cmd_hdr));
        hdr->command_id = cpu_to_be16(cmd);
        hdr->seq_no = cpu_to_be16(++wmi->tx_seq_id);
 
+       spin_lock_irqsave(&wmi->wmi_lock, flags);
+       wmi->last_seq_id = wmi->tx_seq_id;
+       spin_unlock_irqrestore(&wmi->wmi_lock, flags);
+
        return htc_send_epid(wmi->htc, skb, wmi->ctrl_epid);
 }
 
@@ -292,7 +297,6 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,
        struct sk_buff *skb;
        u8 *data;
        int time_left, ret = 0;
-       unsigned long flags;
 
        if (ah->ah_flags & AH_UNPLUGGED)
                return 0;
@@ -320,10 +324,6 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,
        wmi->cmd_rsp_buf = rsp_buf;
        wmi->cmd_rsp_len = rsp_len;
 
-       spin_lock_irqsave(&wmi->wmi_lock, flags);
-       wmi->last_cmd_id = cmd_id;
-       spin_unlock_irqrestore(&wmi->wmi_lock, flags);
-
        ret = ath9k_wmi_cmd_issue(wmi, skb, cmd_id, cmd_len);
        if (ret)
                goto out;
diff --git a/drivers/net/wireless/ath/ath9k/wmi.h 
b/drivers/net/wireless/ath/ath9k/wmi.h
index 0db37f2..2aad6dc 100644
--- a/drivers/net/wireless/ath/ath9k/wmi.h
+++ b/drivers/net/wireless/ath/ath9k/wmi.h
@@ -143,7 +143,7 @@ struct wmi {
        enum htc_endpoint_id ctrl_epid;
        struct mutex op_mutex;
        struct completion cmd_wait;
-       enum wmi_cmd_id last_cmd_id;
+       u16 last_seq_id;
        struct sk_buff_head wmi_event_queue;
        struct tasklet_struct wmi_event_tasklet;
        u16 tx_seq_id;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/