Staging: rtl8192su: remove JOHN_DUMP[_TXDESC] ifdefs

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

diff --git a/drivers/staging/rtl8192su/TODO b/drivers/staging/rtl8192su/TODO
index 0b89c9dd5f26de30c0619d6e1d98b99238b449de..c8140d54313f621006ee8160e02d6e46d5ff0c2d 100644 (file)
--- a/drivers/staging/rtl8192su/TODO
+++ b/drivers/staging/rtl8192su/TODO
@@ -1,6 +1,5 @@
 TODO:
 - prepare private ieee80211 stack for merge with rtl8187se's version:
-  - remove JOHN_DUMP[_DESC] ifdefs
   - remove [IN]_OPENSUSE_SLED definitions
   - remove superflous container_of definition from ieee80211.h
   - remove rtl8192su's specific dead code

diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c
index 174af0c7ab94f49e711b42888a5fa4c3ac76f227..f6ceaa326663084287a59f9a1c3eda0b8794a25c 100644 (file)
--- a/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c
+++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c
@@ -502,18 +502,6 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
        skb_pull(skb, 8);
        skb_trim(skb, skb->len - 4);
 
-//john's test
-#ifdef JOHN_DUMP
-if( ((u16*)skb->data)[0] & 0x4000){
-        printk("@@ rx decrypted skb->data");
-        int i;
-        for(i=0;i<skb->len;i++){
-                if( (i%24)==0 ) printk("\n");
-                printk("%2x ", ((u8*)skb->data)[i]);
-        }
-        printk("\n");
-}
-#endif /*JOHN_DUMP*/
        return keyidx;
 }
 

diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c
index ea96b1159031df48c138f2e13e3999f60d9d205a..d22e4e0fdc849b793017dc800157a1a7f89aa9d5 100644 (file)
--- a/drivers/staging/rtl8192su/r8192U_core.c
+++ b/drivers/staging/rtl8192su/r8192U_core.c
@@ -1966,14 +1966,6 @@ short rtl8192SU_tx_cmd(struct net_device *dev, struct sk_buff *skb)
        idx_pipe = txqueue2outpipe(priv,queue_index);
        //printk("=============>%s queue_index:%d, outpipe:%d\n", __func__,queue_index,priv->RtOutPipes[idx_pipe]);
 
-#ifdef JOHN_DUMP_TXDESC
-       int i;
-       printk("Len = %d\n", skb->len);
-       for (i = 0; i < 8; i++)
-               printk("%2.2x ", *((u8*)skb->data+i));
-       printk("\n");
-#endif
-
        usb_fill_bulk_urb(tx_urb,
                                    priv->udev,
                                    usb_sndbulkpipe(priv->udev,priv->RtOutPipes[idx_pipe]),