mirror of https://gitee.com/openkylin/linux.git
staging: rtl8192su: remove some unused code, cleanup
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Florian Schilhabel
Greg Kroah-Hartman
parent
47790cb226
commit
5d4d454c30
|
|
@ -9,7 +9,6 @@
|
|||
* more details.
|
||||
*/
|
||||
|
||||
//#include <linux/config.h>
|
||||
#include <linux/version.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
|
|
@ -131,7 +130,6 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
|
|||
qc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&
|
||||
(WLAN_FC_GET_STYPE(fc) & 0x08));
|
||||
*/
|
||||
// fixed by David :2006.9.6
|
||||
qc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&
|
||||
(WLAN_FC_GET_STYPE(fc) & 0x80));
|
||||
aad_len = 22;
|
||||
|
|
@ -210,7 +208,6 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|||
pos = skb_push(skb, CCMP_HDR_LEN);
|
||||
memmove(pos, pos + CCMP_HDR_LEN, hdr_len);
|
||||
pos += hdr_len;
|
||||
// mic = skb_put(skb, CCMP_MIC_LEN);
|
||||
|
||||
i = CCMP_PN_LEN - 1;
|
||||
while (i >= 0) {
|
||||
|
|
@ -240,7 +237,6 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|||
u8 *e = key->tx_e;
|
||||
u8 *s0 = key->tx_s0;
|
||||
|
||||
//mic is moved to here by john
|
||||
mic = skb_put(skb, CCMP_MIC_LEN);
|
||||
|
||||
ccmp_init_blocks(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0);
|
||||
|
|
@ -445,7 +441,6 @@ static char * ieee80211_ccmp_print_stats(char *p, void *priv)
|
|||
|
||||
void ieee80211_ccmp_null(void)
|
||||
{
|
||||
// printk("============>%s()\n", __FUNCTION__);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
* more details.
|
||||
*/
|
||||
|
||||
//#include <linux/config.h>
|
||||
#include <linux/version.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
|
|
@ -571,12 +570,9 @@ static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *pri
|
|||
|
||||
michael_mic_hdr(skb, tkey->tx_hdr);
|
||||
|
||||
// { david, 2006.9.1
|
||||
// fix the wpa process with wmm enabled.
|
||||
if(IEEE80211_QOS_HAS_SEQ(le16_to_cpu(hdr->frame_ctl))) {
|
||||
tkey->tx_hdr[12] = *(skb->data + hdr_len - 2) & 0x07;
|
||||
}
|
||||
// }
|
||||
pos = skb_put(skb, 8);
|
||||
|
||||
if (michael_mic(tkey->tx_tfm_michael, &tkey->key[16], tkey->tx_hdr,
|
||||
|
|
@ -620,12 +616,9 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
|
|||
return -1;
|
||||
|
||||
michael_mic_hdr(skb, tkey->rx_hdr);
|
||||
// { david, 2006.9.1
|
||||
// fix the wpa process with wmm enabled.
|
||||
if(IEEE80211_QOS_HAS_SEQ(le16_to_cpu(hdr->frame_ctl))) {
|
||||
tkey->rx_hdr[12] = *(skb->data + hdr_len - 2) & 0x07;
|
||||
}
|
||||
// }
|
||||
|
||||
if (michael_mic(tkey->rx_tfm_michael, &tkey->key[24], tkey->rx_hdr,
|
||||
skb->data + hdr_len, skb->len - 8 - hdr_len, mic))
|
||||
|
|
@ -774,6 +767,5 @@ void __exit ieee80211_crypto_tkip_exit(void)
|
|||
|
||||
void ieee80211_tkip_null(void)
|
||||
{
|
||||
// printk("============>%s()\n", __FUNCTION__);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
* more details.
|
||||
*/
|
||||
|
||||
//#include <linux/config.h>
|
||||
#include <linux/version.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
|
|
@ -291,6 +290,5 @@ void __exit ieee80211_crypto_wep_exit(void)
|
|||
|
||||
void ieee80211_wep_null(void)
|
||||
{
|
||||
// printk("============>%s()\n", __FUNCTION__);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
*******************************************************************************/
|
||||
|
||||
#include <linux/compiler.h>
|
||||
//#include <linux/config.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/if_arp.h>
|
||||
#include <linux/in6.h>
|
||||
|
|
@ -142,7 +141,6 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
|
|||
spin_lock_init(&ieee->wpax_suitlist_lock);
|
||||
spin_lock_init(&ieee->bw_spinlock);
|
||||
spin_lock_init(&ieee->reorder_spinlock);
|
||||
//added by WB
|
||||
atomic_set(&(ieee->atm_chnlop), 0);
|
||||
atomic_set(&(ieee->atm_swbw), 0);
|
||||
|
||||
|
|
@ -153,7 +151,6 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
|
|||
ieee->privacy_invoked = 0;
|
||||
ieee->ieee802_1x = 1;
|
||||
ieee->raw_tx = 0;
|
||||
//ieee->hwsec_support = 1; //default support hw security. //use module_param instead.
|
||||
ieee->hwsec_active = 0; //disable hwsec, switch it on when necessary.
|
||||
|
||||
ieee80211_softmac_init(ieee);
|
||||
|
|
@ -196,8 +193,6 @@ void free_ieee80211(struct net_device *dev)
|
|||
{
|
||||
struct ieee80211_device *ieee = netdev_priv(dev);
|
||||
int i;
|
||||
//struct list_head *p, *q;
|
||||
// del_timer_sync(&ieee->SwBwTimer);
|
||||
#if 1
|
||||
if (ieee->pHTInfo != NULL)
|
||||
{
|
||||
|
|
@ -228,23 +223,6 @@ void free_ieee80211(struct net_device *dev)
|
|||
|
||||
u32 ieee80211_debug_level = 0;
|
||||
static int debug = \
|
||||
// IEEE80211_DL_INFO |
|
||||
// IEEE80211_DL_WX |
|
||||
// IEEE80211_DL_SCAN |
|
||||
// IEEE80211_DL_STATE |
|
||||
// IEEE80211_DL_MGMT |
|
||||
// IEEE80211_DL_FRAG |
|
||||
// IEEE80211_DL_EAP |
|
||||
// IEEE80211_DL_DROP |
|
||||
// IEEE80211_DL_TX |
|
||||
// IEEE80211_DL_RX |
|
||||
//IEEE80211_DL_QOS |
|
||||
// IEEE80211_DL_HT |
|
||||
// IEEE80211_DL_TS |
|
||||
// IEEE80211_DL_BA |
|
||||
// IEEE80211_DL_REORDER|
|
||||
// IEEE80211_DL_TRACE |
|
||||
//IEEE80211_DL_DATA |
|
||||
IEEE80211_DL_ERR //awayls open this flags to show error out
|
||||
;
|
||||
struct proc_dir_entry *ieee80211_proc = NULL;
|
||||
|
|
|
|||
Loading…
Reference in New Issue