evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rt2x00: simplify txstatus_fifo handling

Browse source 
Signed-off-by: Johannes Stezenbach <js@sig21.net>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Stezenbach 2010-12-27 15:04:29 +01:00 • committed by John W. Linville
parent 97e2c40269
commit c4d6324421
2 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/wireless/rt2x00/rt2800pci.c
View file

@ -688,14 +688,7 @@ static void rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
u32 status; u32 status;
u8 qid; u8 qid;
while (!kfifo_is_empty(&rt2x00dev->txstatus_fifo)) { while (kfifo_get(&rt2x00dev->txstatus_fifo, &status)) {
/* Now remove the tx status from the FIFO */
if (kfifo_out(&rt2x00dev->txstatus_fifo, &status,
sizeof(status)) != sizeof(status)) {
WARN_ON(1);
break;
}
qid = rt2x00_get_field32(status, TX_STA_FIFO_PID_QUEUE); qid = rt2x00_get_field32(status, TX_STA_FIFO_PID_QUEUE);
if (qid >= QID_RX) { if (qid >= QID_RX) {
/* /*
@ -803,14 +796,7 @@ static void rt2800pci_txstatus_interrupt(struct rt2x00_dev *rt2x00dev)
if (!rt2x00_get_field32(status, TX_STA_FIFO_VALID)) if (!rt2x00_get_field32(status, TX_STA_FIFO_VALID))
break; break;
if (kfifo_is_full(&rt2x00dev->txstatus_fifo)) { if (!kfifo_put(&rt2x00dev->txstatus_fifo, &status)) {
WARNING(rt2x00dev, "TX status FIFO overrun,"
" drop tx status report.\n");
break;
}
if (kfifo_in(&rt2x00dev->txstatus_fifo, &status,
sizeof(status)) != sizeof(status)) {
WARNING(rt2x00dev, "TX status FIFO overrun," WARNING(rt2x00dev, "TX status FIFO overrun,"
"drop tx status report.\n"); "drop tx status report.\n");
break; break;

2
drivers/net/wireless/rt2x00/rt2x00.h
View file

@ -908,7 +908,7 @@ struct rt2x00_dev {
/* /*
* FIFO for storing tx status reports between isr and tasklet. * FIFO for storing tx status reports between isr and tasklet.
*/ */
struct kfifo txstatus_fifo; DECLARE_KFIFO_PTR(txstatus_fifo, u32);
/* /*
* Tasklet for processing tx status reports (rt2800pci). * Tasklet for processing tx status reports (rt2800pci).