From: Seth Forshee Date: Thu, 15 Nov 2012 14:07:57 +0000 (-0600) Subject: brcmsmac: Use correct descriptor count when calculating next rx descriptor X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b05618deb4ac7c22d876acc19debb7ac63786f37;p=linux-beck.git brcmsmac: Use correct descriptor count when calculating next rx descriptor nextrxd() is calling txd(), which means that the tx descriptor count is used to determine when to wrap for determining the next ring buffer entry. This has worked so far since the driver has been using the same number of rx and tx descriptors, but it's obviously going to be a problem if different numbers of descriptors are used. Acked-by: Arend van Spriel Signed-off-by: Seth Forshee Tested-by: Daniel Wagner Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/brcm80211/brcmsmac/dma.c index 426b9a977164..d7ce1ac9adc9 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c @@ -361,7 +361,7 @@ static uint prevtxd(struct dma_info *di, uint i) static uint nextrxd(struct dma_info *di, uint i) { - return txd(di, i + 1); + return rxd(di, i + 1); } static uint ntxdactive(struct dma_info *di, uint h, uint t)