p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rtlwifi: rtl8192ee: Fix problems with calculating free space in FIFO 

This driver utilizes a FIFO buffer for RX descriptors. There are four places
in the code where it calculates the number of free slots. Several of those
locations do the calculation incorrectly. To fix these and to prevent future
mistakes, a common inline routine is created.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org> [V3.18]
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Larry Finger 2015-02-03 11:15:18 -06:00 committed by Kalle Valo
parent d0311314d0
commit 6d4beca377
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/rtlwifi/pci.h
View File

@ -325,4 +325,11 @@ static inline void pci_write32_async(struct rtl_priv *rtlpriv,
writel(val, (u8 __iomem *) rtlpriv->io.pci_mem_start + addr);
}
static inline u16 calc_fifo_space(u16 rp, u16 wp)
{
if (rp <= wp)
return RTL_PCI_MAX_RX_COUNT - 1 + rp - wp;
return rp - wp - 1;
}
#endif

9
drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
View File

@ -499,14 +499,7 @@ u16 rtl92ee_rx_desc_buff_remained_cnt(struct ieee80211_hw *hw, u8 queue_index)
if (!start_rx)
return 0;
if ((last_read_point > (RX_DESC_NUM_92E / 2)) &&
(read_point <= (RX_DESC_NUM_92E / 2))) {
remind_cnt = RX_DESC_NUM_92E - write_point;
} else {
remind_cnt = (read_point >= write_point) ?
(read_point - write_point) :
(RX_DESC_NUM_92E - write_point + read_point);
}
remind_cnt = calc_fifo_space(read_point, write_point);
if (remind_cnt == 0)
return 0;