staging: wfx: ensure that packet_id is unique

In current code, packet_id is derivated from mac802.11 packet sequence
number, but this number is only unique for a station. It is not
sufficient.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200115135338.14374-60-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c
index c329945..20f4740 100644 (file)
--- a/drivers/staging/wfx/data_tx.c
+++ b/drivers/staging/wfx/data_tx.c
@@ -469,8 +469,12 @@ static int wfx_tx_inner(struct wfx_vif *wvif, struct ieee80211_sta *sta,
 
        // Fill tx request
        req = (struct hif_req_tx *)hif_msg->body;
-       req->packet_id = queue_id << 16 |
-                        IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
+       // packet_id just need to be unique on device. 32bits are more than
+       // necessary for that task, so we tae advantage of it to add some extra
+       // data for debug.
+       req->packet_id = queue_id << 28 |
+                        IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl)) << 16 |
+                        (atomic_add_return(1, &wvif->wdev->packet_id) & 0xFFFF);
        req->data_flags.fc_offset = offset;
        if (tx_info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM)
                req->data_flags.after_dtim = 1;

diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h
index 5d61946..8b85bb1 100644 (file)
--- a/drivers/staging/wfx/wfx.h
+++ b/drivers/staging/wfx/wfx.h
@@ -54,6 +54,7 @@ struct wfx_dev {
        int                     tx_burst_idx;
        atomic_t                tx_lock;
 
+       atomic_t                packet_id;
        u32                     key_map;
        struct hif_req_add_key  keys[MAX_KEY_ENTRIES];