Commit f59d0127 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 86467e7b
...@@ -304,7 +304,6 @@ ieee80211_classify(struct sk_buff *skb, struct ieee80211_network *network) ...@@ -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) void ieee80211_tx_query_agg_cap(struct ieee80211_device* ieee, struct sk_buff* skb, cb_desc* tcb_desc)
{ {
PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
......
...@@ -541,7 +541,8 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee, ...@@ -541,7 +541,8 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
return -EINVAL; return -EINVAL;
} }
sec.flags |= SEC_ENABLED;// | SEC_ENCRYPT; sec.flags |= SEC_ENABLED;
if ((encoding->flags & IW_ENCODE_DISABLED) || if ((encoding->flags & IW_ENCODE_DISABLED) ||
ext->alg == IW_ENCODE_ALG_NONE) { ext->alg == IW_ENCODE_ALG_NONE) {
if (*crypt) if (*crypt)
...@@ -644,15 +645,12 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee, ...@@ -644,15 +645,12 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
sec.key_sizes[idx] = ext->key_len; sec.key_sizes[idx] = ext->key_len;
sec.flags |= (1 << idx); sec.flags |= (1 << idx);
if (ext->alg == IW_ENCODE_ALG_WEP) { if (ext->alg == IW_ENCODE_ALG_WEP) {
// sec.encode_alg[idx] = SEC_ALG_WEP;
sec.flags |= SEC_LEVEL; sec.flags |= SEC_LEVEL;
sec.level = SEC_LEVEL_1; sec.level = SEC_LEVEL_1;
} else if (ext->alg == IW_ENCODE_ALG_TKIP) { } else if (ext->alg == IW_ENCODE_ALG_TKIP) {
// sec.encode_alg[idx] = SEC_ALG_TKIP;
sec.flags |= SEC_LEVEL; sec.flags |= SEC_LEVEL;
sec.level = SEC_LEVEL_2; sec.level = SEC_LEVEL_2;
} else if (ext->alg == IW_ENCODE_ALG_CCMP) { } else if (ext->alg == IW_ENCODE_ALG_CCMP) {
// sec.encode_alg[idx] = SEC_ALG_CCMP;
sec.flags |= SEC_LEVEL; sec.flags |= SEC_LEVEL;
sec.level = SEC_LEVEL_3; sec.level = SEC_LEVEL_3;
} }
......
...@@ -2708,8 +2708,8 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv, ...@@ -2708,8 +2708,8 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv,
/* handle manage frame frame beacon and probe response */ /* handle manage frame frame beacon and probe response */
static int rtl8192_handle_beacon(struct net_device * dev, static int rtl8192_handle_beacon(struct net_device * dev,
struct ieee80211_beacon * beacon, struct ieee80211_probe_response *beacon,
struct ieee80211_network * network) struct ieee80211_network *network)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment