mirror of https://gitee.com/openkylin/linux.git
Staging: rtl8192su/ieee80211: ieee80211.h cleanups
* remove unused / duplicated definitions * remove unused / used only once typedefs * fix comments, remove useless ones * convert defines to enums where appropriate * use __func__ instead of __FUNCTION__ * make some minor coding style fixes * misc cleanups Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
86467e7bc1
commit
f59d012790
File diff suppressed because it is too large
Load Diff
|
@ -304,7 +304,6 @@ ieee80211_classify(struct sk_buff *skb, struct ieee80211_network *network)
|
|||
}
|
||||
}
|
||||
|
||||
#define SN_LESS(a, b) (((a-b)&0x800)!=0)
|
||||
void ieee80211_tx_query_agg_cap(struct ieee80211_device* ieee, struct sk_buff* skb, cb_desc* tcb_desc)
|
||||
{
|
||||
PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
|
||||
|
|
|
@ -541,7 +541,8 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
sec.flags |= SEC_ENABLED;// | SEC_ENCRYPT;
|
||||
sec.flags |= SEC_ENABLED;
|
||||
|
||||
if ((encoding->flags & IW_ENCODE_DISABLED) ||
|
||||
ext->alg == IW_ENCODE_ALG_NONE) {
|
||||
if (*crypt)
|
||||
|
@ -644,15 +645,12 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
|
|||
sec.key_sizes[idx] = ext->key_len;
|
||||
sec.flags |= (1 << idx);
|
||||
if (ext->alg == IW_ENCODE_ALG_WEP) {
|
||||
// sec.encode_alg[idx] = SEC_ALG_WEP;
|
||||
sec.flags |= SEC_LEVEL;
|
||||
sec.level = SEC_LEVEL_1;
|
||||
} else if (ext->alg == IW_ENCODE_ALG_TKIP) {
|
||||
// sec.encode_alg[idx] = SEC_ALG_TKIP;
|
||||
sec.flags |= SEC_LEVEL;
|
||||
sec.level = SEC_LEVEL_2;
|
||||
} else if (ext->alg == IW_ENCODE_ALG_CCMP) {
|
||||
// sec.encode_alg[idx] = SEC_ALG_CCMP;
|
||||
sec.flags |= SEC_LEVEL;
|
||||
sec.level = SEC_LEVEL_3;
|
||||
}
|
||||
|
|
|
@ -2708,8 +2708,8 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv,
|
|||
|
||||
/* handle manage frame frame beacon and probe response */
|
||||
static int rtl8192_handle_beacon(struct net_device * dev,
|
||||
struct ieee80211_beacon * beacon,
|
||||
struct ieee80211_network * network)
|
||||
struct ieee80211_probe_response *beacon,
|
||||
struct ieee80211_network *network)
|
||||
{
|
||||
struct r8192_priv *priv = ieee80211_priv(dev);
|
||||
|
||||
|
|
Loading…
Reference in New Issue