mirror of https://gitee.com/openkylin/linux.git
staging: rtl8192su: cleanup in ieee80211_tx.c, ieee80211_wx.c
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
5889ef2dac
commit
e2e539065f
|
|
@ -32,7 +32,6 @@
|
|||
******************************************************************************/
|
||||
|
||||
#include <linux/compiler.h>
|
||||
//#include <linux/config.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/if_arp.h>
|
||||
#include <linux/in6.h>
|
||||
|
|
@ -208,7 +207,6 @@ int ieee80211_encrypt_fragment(
|
|||
/* To encrypt, frame format is:
|
||||
* IV (4 bytes), clear payload (including SNAP), ICV (4 bytes) */
|
||||
|
||||
// PR: FIXME: Copied from hostap. Check fragmentation/MSDU/MPDU encryption.
|
||||
/* Host-based IEEE 802.11 fragmentation for TX is not yet supported, so
|
||||
* call both MSDU and MPDU encryption functions from here. */
|
||||
atomic_inc(&crypt->refcnt);
|
||||
|
|
@ -231,7 +229,6 @@ int ieee80211_encrypt_fragment(
|
|||
|
||||
|
||||
void ieee80211_txb_free(struct ieee80211_txb *txb) {
|
||||
//int i;
|
||||
if (unlikely(!txb))
|
||||
return;
|
||||
kfree(txb);
|
||||
|
|
@ -280,7 +277,6 @@ ieee80211_classify(struct sk_buff *skb, struct ieee80211_network *network)
|
|||
if (eth->h_proto != htons(ETH_P_IP))
|
||||
return 0;
|
||||
|
||||
// IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA, skb->data, skb->len);
|
||||
ip = ip_hdr(skb);
|
||||
|
||||
switch (ip->tos & 0xfc) {
|
||||
|
|
@ -681,10 +677,8 @@ int rtl8192_ieee80211_rtl_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
if (encrypt)
|
||||
fc = IEEE80211_FTYPE_DATA | IEEE80211_FCTL_WEP;
|
||||
else
|
||||
|
||||
fc = IEEE80211_FTYPE_DATA;
|
||||
|
||||
//if(ieee->current_network.QoS_Enable)
|
||||
if(qos_actived)
|
||||
fc |= IEEE80211_STYPE_QOS_DATA;
|
||||
else
|
||||
|
|
@ -765,7 +759,6 @@ int rtl8192_ieee80211_rtl_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
txb->encrypted = encrypt;
|
||||
txb->payload_size = bytes;
|
||||
|
||||
//if (ieee->current_network.QoS_Enable)
|
||||
if(qos_actived)
|
||||
{
|
||||
txb->queue_index = UP2AC(skb->priority);
|
||||
|
|
@ -812,7 +805,6 @@ int rtl8192_ieee80211_rtl_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
/* The last fragment takes the remaining length */
|
||||
bytes = bytes_last_frag;
|
||||
}
|
||||
//if(ieee->current_network.QoS_Enable)
|
||||
if(qos_actived)
|
||||
{
|
||||
// add 1 only indicate to corresponding seq number control 2006/7/12
|
||||
|
|
@ -889,7 +881,6 @@ int rtl8192_ieee80211_rtl_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
if ( tcb_desc->bMulticast || tcb_desc->bBroadcast)
|
||||
tcb_desc->data_rate = ieee->basic_rate;
|
||||
else
|
||||
//tcb_desc->data_rate = CURRENT_RATE(ieee->current_network.mode, ieee->rate, ieee->HTCurrentOperaRate);
|
||||
tcb_desc->data_rate = CURRENT_RATE(ieee->mode, ieee->rate, ieee->HTCurrentOperaRate);
|
||||
ieee80211_qurey_ShortPreambleMode(ieee, tcb_desc);
|
||||
ieee80211_tx_query_agg_cap(ieee, txb->fragments[0], tcb_desc);
|
||||
|
|
@ -897,8 +888,6 @@ int rtl8192_ieee80211_rtl_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
ieee80211_query_BandwidthMode(ieee, tcb_desc);
|
||||
ieee80211_query_protectionmode(ieee, tcb_desc, txb->fragments[0]);
|
||||
ieee80211_query_seqnum(ieee, txb->fragments[0], header.addr1);
|
||||
// IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA, txb->fragments[0]->data, txb->fragments[0]->len);
|
||||
//IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA, tcb_desc, sizeof(cb_desc));
|
||||
#endif
|
||||
}
|
||||
spin_unlock_irqrestore(&ieee->lock, flags);
|
||||
|
|
|
|||
|
|
@ -77,7 +77,6 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee,
|
|||
/* Add the ESSID */
|
||||
iwe.cmd = SIOCGIWESSID;
|
||||
iwe.u.data.flags = 1;
|
||||
// if (network->flags & NETWORK_EMPTY_ESSID) {
|
||||
if (network->ssid_len == 0) {
|
||||
iwe.u.data.length = sizeof("<hidden>");
|
||||
start = iwe_stream_add_point(info, start, stop, &iwe, "<hidden>");
|
||||
|
|
@ -240,9 +239,7 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
|
|||
unsigned long flags;
|
||||
|
||||
char *ev = extra;
|
||||
// char *stop = ev + IW_SCAN_MAX_DATA;
|
||||
char *stop = ev + wrqu->data.length;//IW_SCAN_MAX_DATA;
|
||||
//char *stop = ev + IW_SCAN_MAX_DATA;
|
||||
int i = 0;
|
||||
int err = 0;
|
||||
IEEE80211_DEBUG_WX("Getting scan\n");
|
||||
|
|
@ -511,7 +508,6 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
|
|||
struct ieee80211_security sec = {
|
||||
.flags = 0,
|
||||
};
|
||||
//printk("======>encoding flag:%x,ext flag:%x, ext alg:%d\n", encoding->flags,ext->ext_flags, ext->alg);
|
||||
idx = encoding->flags & IW_ENCODE_INDEX;
|
||||
if (idx) {
|
||||
if (idx < 1 || idx > WEP_KEYS)
|
||||
|
|
@ -562,7 +558,6 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
|
|||
}
|
||||
|
||||
sec.enabled = 1;
|
||||
// sec.encrypt = 1;
|
||||
|
||||
switch (ext->alg) {
|
||||
case IW_ENCODE_ALG_WEP:
|
||||
|
|
@ -580,7 +575,7 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
|
|||
ret = -EINVAL;
|
||||
goto done;
|
||||
}
|
||||
printk("alg name:%s\n",alg);
|
||||
IEEE80211_DEBUG_WX("alg name: %s\n", alg);
|
||||
|
||||
ops = ieee80211_get_crypto_ops(alg);
|
||||
if (ops == NULL)
|
||||
|
|
@ -624,8 +619,6 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
|
|||
goto done;
|
||||
}
|
||||
#if 1
|
||||
//skip_host_crypt:
|
||||
//printk("skip_host_crypt:ext_flags:%x\n", ext->ext_flags);
|
||||
if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
|
||||
ieee->tx_keyidx = idx;
|
||||
sec.active_key = idx;
|
||||
|
|
@ -633,7 +626,6 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
|
|||
}
|
||||
|
||||
if (ext->alg != IW_ENCODE_ALG_NONE) {
|
||||
//memcpy(sec.keys[idx], ext->key, ext->key_len);
|
||||
sec.key_sizes[idx] = ext->key_len;
|
||||
sec.flags |= (1 << idx);
|
||||
if (ext->alg == IW_ENCODE_ALG_WEP) {
|
||||
|
|
@ -690,7 +682,6 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee,
|
|||
switch (data->flags & IW_AUTH_INDEX) {
|
||||
case IW_AUTH_WPA_VERSION:
|
||||
/*need to support wpa2 here*/
|
||||
//printk("wpa version:%x\n", data->value);
|
||||
break;
|
||||
case IW_AUTH_CIPHER_PAIRWISE:
|
||||
case IW_AUTH_CIPHER_GROUP:
|
||||
|
|
@ -708,8 +699,6 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee,
|
|||
break;
|
||||
|
||||
case IW_AUTH_80211_AUTH_ALG:
|
||||
//printk("======>%s():data->value is %d\n",__FUNCTION__,data->value);
|
||||
// ieee->open_wep = (data->value&IW_AUTH_ALG_OPEN_SYSTEM)?1:0;
|
||||
if(data->value & IW_AUTH_ALG_SHARED_KEY){
|
||||
ieee->open_wep = 0;
|
||||
ieee->auth_mode = 1;
|
||||
|
|
@ -721,17 +710,14 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee,
|
|||
else if(data->value & IW_AUTH_ALG_LEAP){
|
||||
ieee->open_wep = 1;
|
||||
ieee->auth_mode = 2;
|
||||
//printk("hahahaa:LEAP\n");
|
||||
}
|
||||
else
|
||||
return -EINVAL;
|
||||
//printk("open_wep:%d\n", ieee->open_wep);
|
||||
break;
|
||||
|
||||
#if 1
|
||||
case IW_AUTH_WPA_ENABLED:
|
||||
ieee->wpa_enabled = (data->value)?1:0;
|
||||
//printk("enable wpa:%d\n", ieee->wpa_enabled);
|
||||
break;
|
||||
|
||||
#endif
|
||||
|
|
@ -755,7 +741,6 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len)
|
|||
|
||||
if (len>MAX_WPA_IE_LEN || (len && ie == NULL))
|
||||
{
|
||||
// printk("return error out, len:%d\n", len);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue