git.openwrt.org Git - openwrt/staging/jow.git/blob

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