Commit 85c876e4 authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Delete dead code in ieee80211 lib 



Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c8881632

drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_tkip.c

+0 −24
Original line number Diff line number Diff line
@@ -324,18 +324,6 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) 


	hdr = (struct ieee80211_hdr_4addr *) skb->data;



#if 0

printk("@@ tkey\n");

printk("%x|", ((u32*)tkey->key)[0]);

printk("%x|", ((u32*)tkey->key)[1]);

printk("%x|", ((u32*)tkey->key)[2]);

printk("%x|", ((u32*)tkey->key)[3]);

printk("%x|", ((u32*)tkey->key)[4]);

printk("%x|", ((u32*)tkey->key)[5]);

printk("%x|", ((u32*)tkey->key)[6]);

printk("%x\n", ((u32*)tkey->key)[7]);

#endif



	if (!tcb_desc->bHwSec)

	{

		if (!tkey->tx_phase1_done) {
@@ -512,18 +500,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;

}

drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_wep.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 * more details.

 */



//#include <linux/config.h>

#include <linux/version.h>

#include <linux/module.h>

#include <linux/init.h>

drivers/staging/rtl8192e/ieee80211/ieee80211_module.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ void free_ieee80211(struct net_device *dev) 
#ifdef CONFIG_IEEE80211_DEBUG



u32 ieee80211_debug_level = 0;

static int debug = \

static int debug =

	/* IEEE80211_DL_INFO	| */

	/* IEEE80211_DL_WX	| */

	/* IEEE80211_DL_SCAN	| */

drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c

+15 −179

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c

+10 −204

File changed.

Preview size limit exceeded, changes collapsed.