From ecf5749d95e0826e321bc49718da0687351f6134 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 3 Jul 2009 16:07:20 +0200 Subject: [PATCH] --- yaml --- r: 162036 b: refs/heads/master c: 1522987a7f5c4be0e0a19217749ff10a26e89cdb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192su/Makefile | 1 - trunk/drivers/staging/rtl8192su/r8192U_core.c | 22 ------------------- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/[refs] b/[refs] index 382feed206f9..2b3663e2d265 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a63e8287d8d8a6e0150b27deaf7ba97110dc274 +refs/heads/master: 1522987a7f5c4be0e0a19217749ff10a26e89cdb diff --git a/trunk/drivers/staging/rtl8192su/Makefile b/trunk/drivers/staging/rtl8192su/Makefile index abdf53d9abad..e781c7a3bb89 100644 --- a/trunk/drivers/staging/rtl8192su/Makefile +++ b/trunk/drivers/staging/rtl8192su/Makefile @@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1 EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 -EXTRA_CFLAGS += -DRTL8192SU_FPGA_UNSPECIFIED_NETWORK=0 #EXTRA_CFLAGS += -DRTL8192SU_FPGA_2MAC_VERIFICATION #=0 EXTRA_CFLAGS += -DRTL8192SU_ASIC_VERIFICATION EXTRA_CFLAGS += -DRTL8192SU_USB_PHY_TEST=0 diff --git a/trunk/drivers/staging/rtl8192su/r8192U_core.c b/trunk/drivers/staging/rtl8192su/r8192U_core.c index 5c643d70c526..eb5f9011f10d 100644 --- a/trunk/drivers/staging/rtl8192su/r8192U_core.c +++ b/trunk/drivers/staging/rtl8192su/r8192U_core.c @@ -2957,19 +2957,6 @@ short rtl8192SU_tx(struct net_device *dev, struct sk_buff* skb) memset(tx_desc, 0, sizeof(tx_desc_819x_usb)); -#if RTL8192SU_FPGA_UNSPECIFIED_NETWORK - if(IsQoSDataFrame(skb->data)) - { - tcb_desc->bAMPDUEnable = TRUE; - tx_desc->NonQos = 0; - } - else - tcb_desc->bAMPDUEnable = FALSE; - - tcb_desc->bPacketBW = TRUE; - priv->CurrentChannelBW = HT_CHANNEL_WIDTH_20_40; -#endif - #if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION)||defined (RTL8192SU_ASIC_VERIFICATION)) tx_desc->NonQos = (IsQoSDataFrame(skb->data)==TRUE)? 0:1; #endif @@ -7280,15 +7267,6 @@ bool rtl8192SU_adapter_start(struct net_device *dev) // We return status here for temporal FPGA verification. 2008.05.12. // -#if RTL8192SU_FPGA_UNSPECIFIED_NETWORK - // - // To send specific number of packets to verify MAC Lookback mode. - // - //SendRandomTxPkt(Adapter, 0); // Burst mode for verification. - //rtStatus = RT_STATUS_FAILURE; - rtStatus = true; - goto end; -#endif // The following IO was for FPGA verification purpose. Added by Roger, 2008.09.11. #if 0