| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849 |
- From 2d91c8ad068a5cad4d9e7ece8dc811a697c7176a Mon Sep 17 00:00:00 2001
- From: Wright Feng <Wright.Feng@cypress.com>
- Date: Fri, 26 Apr 2019 03:41:46 +0000
- Subject: [PATCH] brcmfmac: set txflow request id from 1 to pktids array size
- Some PCIE firmwares drop txstatus if pktid is 0 and make packet held in
- host side and never be released. If that packet type is 802.1x, the
- pend_8021x_cnt value will be always greater than 0 and show "Timed out
- waiting for no pending 802.1x packets" error message when sending key to
- dongle every time.
- To be compatible with all firmwares, host should set txflow request id
- from 1 instead of from 0.
- Signed-off-by: Wright Feng <wright.feng@cypress.com>
- Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ---
- drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
- --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
- +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
- @@ -375,7 +375,7 @@ brcmf_msgbuf_get_pktid(struct device *de
- struct brcmf_msgbuf_pktid *pktid;
- struct sk_buff *skb;
-
- - if (idx >= pktids->array_size) {
- + if (idx < 0 || idx >= pktids->array_size) {
- brcmf_err("Invalid packet id %d (max %d)\n", idx,
- pktids->array_size);
- return NULL;
- @@ -745,7 +745,7 @@ static void brcmf_msgbuf_txflow(struct b
- tx_msghdr = (struct msgbuf_tx_msghdr *)ret_ptr;
-
- tx_msghdr->msg.msgtype = MSGBUF_TYPE_TX_POST;
- - tx_msghdr->msg.request_id = cpu_to_le32(pktid);
- + tx_msghdr->msg.request_id = cpu_to_le32(pktid + 1);
- tx_msghdr->msg.ifidx = brcmf_flowring_ifidx_get(flow, flowid);
- tx_msghdr->flags = BRCMF_MSGBUF_PKT_FLAGS_FRAME_802_3;
- tx_msghdr->flags |= (skb->priority & 0x07) <<
- @@ -882,7 +882,7 @@ brcmf_msgbuf_process_txstatus(struct brc
- u16 flowid;
-
- tx_status = (struct msgbuf_tx_status *)buf;
- - idx = le32_to_cpu(tx_status->msg.request_id);
- + idx = le32_to_cpu(tx_status->msg.request_id) - 1;
- flowid = le16_to_cpu(tx_status->compl_hdr.flow_ring_id);
- flowid -= BRCMF_H2D_MSGRING_FLOWRING_IDSTART;
- skb = brcmf_msgbuf_get_pktid(msgbuf->drvr->bus_if->dev,
|
