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>

diff --git a/drivers/staging/rt2870/common/2870_rtmp_init.c b/drivers/staging/rt2870/common/2870_rtmp_init.c
index 40972318b61e9f8fc42f54b445d743350dbfd310..f517d9e902711fae99a6f01a680dbff223bc3382 100644 (file)
--- 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 7ae3e95961333dee091c5d7d61986f9858c06800..a4244b516440f8461f1a85ebc006a2151a1b72ee 100644 (file)
--- 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))