Staging: rtl8192su: remove RTL8192SU_FPGA_UNSPECIFIED_NETWORK ifdefs

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rtl8192su/Makefile b/drivers/staging/rtl8192su/Makefile
index abdf53d9abad34ce2cebb0bfb6a31c6636691698..e781c7a3bb89a5d7997e0a39c2a1709d4d798f09 100644 (file)
--- a/drivers/staging/rtl8192su/Makefile
+++ b/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/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c
index 5c643d70c526d127e161192f49ee2de0dece2b6b..eb5f9011f10d44066518fb1dbb1963c70df9c268 100644 (file)
--- a/drivers/staging/rtl8192su/r8192U_core.c
+++ b/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 @@ start:
 
 // <Roger_Notes> 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