diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-08-23 15:30:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:21 -0700 |
| commit | 256311d34372fa8f7f2fe2af8b5f52f93fe68577 (patch) | |
| tree | b2fc5cc3234eb415d972fc4613c33cd0d11c12e2 | |
| parent | 6e50c49684ff3240b04b91d8d8e64ad7a902ca78 (diff) | |
Staging: rt2870: add fRTUSB_BULK_OUT_DATA_NORMAL_5 quirk
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/rt2870/common/2870_rtmp_init.c | 5 | ||||
| -rw-r--r-- | drivers/staging/rt2870/common/rtusb_bulk.c | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/rt2870/common/2870_rtmp_init.c b/drivers/staging/rt2870/common/2870_rtmp_init.c index 40972318b61..f517d9e9027 100644 --- a/drivers/staging/rt2870/common/2870_rtmp_init.c +++ b/drivers/staging/rt2870/common/2870_rtmp_init.c @@ -1293,12 +1293,7 @@ static void rt2870_hcca_dma_done_tasklet(unsigned long data) RTMPDeQueuePacket(pAd, FALSE, BulkOutPipeId, MAX_TX_PROCESS); } -#ifndef RT30xx - RTUSB_SET_BULK_FLAG(pAd, fRTUSB_BULK_OUT_DATA_NORMAL); -#endif -#ifdef RT30xx RTUSB_SET_BULK_FLAG(pAd, fRTUSB_BULK_OUT_DATA_NORMAL<<4); -#endif RTUSBKickBulkOut(pAd); } } diff --git a/drivers/staging/rt2870/common/rtusb_bulk.c b/drivers/staging/rt2870/common/rtusb_bulk.c index 7ae3e959613..a4244b51644 100644 --- a/drivers/staging/rt2870/common/rtusb_bulk.c +++ b/drivers/staging/rt2870/common/rtusb_bulk.c @@ -976,7 +976,7 @@ VOID RTUSBKickBulkOut( RTUSBBulkOutDataPacket(pAd, 3, pAd->NextBulkOutIndex[3]); } } -#ifdef RT30xx + //PS packets use HCCA queue when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA) if (RTUSB_TEST_BULK_FLAG(pAd, fRTUSB_BULK_OUT_DATA_NORMAL_5)) { @@ -986,7 +986,6 @@ VOID RTUSBKickBulkOut( { } } -#endif // 7. Null frame is the last else if (RTUSB_TEST_BULK_FLAG(pAd, fRTUSB_BULK_OUT_DATA_NULL)) |