Commit 5e540f8a authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman

staging: rtl8192u: Remove superfluous blank lines - Coding Style

Removal of extra blank lines from the ieee80211_softmac.c file
Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 15d7e53e
...@@ -12,8 +12,6 @@ ...@@ -12,8 +12,6 @@
* *
* released under the GPL * released under the GPL
*/ */
#include "ieee80211.h" #include "ieee80211.h"
#include <linux/random.h> #include <linux/random.h>
...@@ -98,7 +96,6 @@ static void ieee80211_MFIE_Grate(struct ieee80211_device *ieee, u8 **tag_p) ...@@ -98,7 +96,6 @@ static void ieee80211_MFIE_Grate(struct ieee80211_device *ieee, u8 **tag_p)
*tag_p = tag; *tag_p = tag;
} }
static void ieee80211_WMM_Info(struct ieee80211_device *ieee, u8 **tag_p) static void ieee80211_WMM_Info(struct ieee80211_device *ieee, u8 **tag_p)
{ {
u8 *tag = *tag_p; u8 *tag = *tag_p;
...@@ -216,7 +213,6 @@ static u8 MgntQuery_MgntFrameTxRate(struct ieee80211_device *ieee) ...@@ -216,7 +213,6 @@ static u8 MgntQuery_MgntFrameTxRate(struct ieee80211_device *ieee)
return rate; return rate;
} }
void ieee80211_sta_wakeup(struct ieee80211_device *ieee, short nl); void ieee80211_sta_wakeup(struct ieee80211_device *ieee, short nl);
inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee) inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee)
...@@ -289,14 +285,11 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee ...@@ -289,14 +285,11 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee
static inline void static inline void
softmac_ps_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee) softmac_ps_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee)
{ {
short single = ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE; short single = ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE;
struct rtl_80211_hdr_3addr *header = struct rtl_80211_hdr_3addr *header =
(struct rtl_80211_hdr_3addr *) skb->data; (struct rtl_80211_hdr_3addr *) skb->data;
if(single){ if(single){
header->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0] << 4); header->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0] << 4);
if (ieee->seq_ctrl[0] == 0xFFF) if (ieee->seq_ctrl[0] == 0xFFF)
...@@ -307,7 +300,6 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee) ...@@ -307,7 +300,6 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee)
/* avoid watchdog triggers */ /* avoid watchdog triggers */
netif_trans_update(ieee->dev); netif_trans_update(ieee->dev);
ieee->softmac_data_hard_start_xmit(skb,ieee->dev,ieee->basic_rate); ieee->softmac_data_hard_start_xmit(skb,ieee->dev,ieee->basic_rate);
}else{ }else{
header->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0] << 4); header->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0] << 4);
...@@ -318,7 +310,6 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee) ...@@ -318,7 +310,6 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee)
ieee->seq_ctrl[0]++; ieee->seq_ctrl[0]++;
ieee->softmac_hard_start_xmit(skb, ieee->dev); ieee->softmac_hard_start_xmit(skb, ieee->dev);
} }
//dev_kfree_skb_any(skb);//edit by thomas //dev_kfree_skb_any(skb);//edit by thomas
} }
...@@ -390,7 +381,6 @@ static void ieee80211_send_beacon(struct ieee80211_device *ieee) ...@@ -390,7 +381,6 @@ static void ieee80211_send_beacon(struct ieee80211_device *ieee)
//spin_unlock_irqrestore(&ieee->beacon_lock,flags); //spin_unlock_irqrestore(&ieee->beacon_lock,flags);
} }
static void ieee80211_send_beacon_cb(struct timer_list *t) static void ieee80211_send_beacon_cb(struct timer_list *t)
{ {
struct ieee80211_device *ieee = struct ieee80211_device *ieee =
...@@ -402,7 +392,6 @@ static void ieee80211_send_beacon_cb(struct timer_list *t) ...@@ -402,7 +392,6 @@ static void ieee80211_send_beacon_cb(struct timer_list *t)
spin_unlock_irqrestore(&ieee->beacon_lock, flags); spin_unlock_irqrestore(&ieee->beacon_lock, flags);
} }
static void ieee80211_send_probe(struct ieee80211_device *ieee) static void ieee80211_send_probe(struct ieee80211_device *ieee)
{ {
struct sk_buff *skb; struct sk_buff *skb;
...@@ -436,7 +425,6 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) ...@@ -436,7 +425,6 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee)
while(1) while(1)
{ {
do{ do{
ch++; ch++;
if (ch > MAX_CHANNEL_NUMBER) if (ch > MAX_CHANNEL_NUMBER)
...@@ -475,7 +463,6 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) ...@@ -475,7 +463,6 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee)
goto out; goto out;
msleep_interruptible(IEEE80211_SOFTMAC_SCAN_TIME); msleep_interruptible(IEEE80211_SOFTMAC_SCAN_TIME);
} }
out: out:
if(ieee->state < IEEE80211_LINKED){ if(ieee->state < IEEE80211_LINKED){
...@@ -520,7 +507,6 @@ static void ieee80211_softmac_scan_wq(struct work_struct *work) ...@@ -520,7 +507,6 @@ static void ieee80211_softmac_scan_wq(struct work_struct *work)
if(channel_map[ieee->current_network.channel] == 1) if(channel_map[ieee->current_network.channel] == 1)
ieee80211_send_probe_requests(ieee); ieee80211_send_probe_requests(ieee);
schedule_delayed_work(&ieee->softmac_scan_wq, IEEE80211_SOFTMAC_SCAN_TIME); schedule_delayed_work(&ieee->softmac_scan_wq, IEEE80211_SOFTMAC_SCAN_TIME);
mutex_unlock(&ieee->scan_mutex); mutex_unlock(&ieee->scan_mutex);
...@@ -534,8 +520,6 @@ static void ieee80211_softmac_scan_wq(struct work_struct *work) ...@@ -534,8 +520,6 @@ static void ieee80211_softmac_scan_wq(struct work_struct *work)
mutex_unlock(&ieee->scan_mutex); mutex_unlock(&ieee->scan_mutex);
} }
static void ieee80211_beacons_start(struct ieee80211_device *ieee) static void ieee80211_beacons_start(struct ieee80211_device *ieee)
{ {
unsigned long flags; unsigned long flags;
...@@ -557,10 +541,8 @@ static void ieee80211_beacons_stop(struct ieee80211_device *ieee) ...@@ -557,10 +541,8 @@ static void ieee80211_beacons_stop(struct ieee80211_device *ieee)
del_timer_sync(&ieee->beacon_timer); del_timer_sync(&ieee->beacon_timer);
spin_unlock_irqrestore(&ieee->beacon_lock, flags); spin_unlock_irqrestore(&ieee->beacon_lock, flags);
} }
void ieee80211_stop_send_beacons(struct ieee80211_device *ieee) void ieee80211_stop_send_beacons(struct ieee80211_device *ieee)
{ {
if(ieee->stop_send_beacons) if(ieee->stop_send_beacons)
...@@ -624,7 +606,6 @@ static void ieee80211_start_scan(struct ieee80211_device *ieee) ...@@ -624,7 +606,6 @@ static void ieee80211_start_scan(struct ieee80211_device *ieee)
} }
}else }else
ieee->start_scan(ieee->dev); ieee->start_scan(ieee->dev);
} }
/* called with wx_mutex held */ /* called with wx_mutex held */
...@@ -642,7 +623,6 @@ void ieee80211_start_scan_syncro(struct ieee80211_device *ieee) ...@@ -642,7 +623,6 @@ void ieee80211_start_scan_syncro(struct ieee80211_device *ieee)
ieee80211_softmac_scan_syncro(ieee); ieee80211_softmac_scan_syncro(ieee);
else else
ieee->scan_syncro(ieee->dev); ieee->scan_syncro(ieee->dev);
} }
EXPORT_SYMBOL(ieee80211_start_scan_syncro); EXPORT_SYMBOL(ieee80211_start_scan_syncro);
...@@ -654,7 +634,6 @@ ieee80211_authentication_req(struct ieee80211_network *beacon, ...@@ -654,7 +634,6 @@ ieee80211_authentication_req(struct ieee80211_network *beacon,
struct ieee80211_authentication *auth; struct ieee80211_authentication *auth;
int len = sizeof(struct ieee80211_authentication) + challengelen + ieee->tx_headroom; int len = sizeof(struct ieee80211_authentication) + challengelen + ieee->tx_headroom;
skb = dev_alloc_skb(len); skb = dev_alloc_skb(len);
if (!skb) return NULL; if (!skb) return NULL;
...@@ -687,10 +666,8 @@ ieee80211_authentication_req(struct ieee80211_network *beacon, ...@@ -687,10 +666,8 @@ ieee80211_authentication_req(struct ieee80211_network *beacon,
auth->status = cpu_to_le16(WLAN_STATUS_SUCCESS); auth->status = cpu_to_le16(WLAN_STATUS_SUCCESS);
return skb; return skb;
} }
static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *dest) static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *dest)
{ {
u8 *tag; u8 *tag;
...@@ -728,10 +705,8 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d ...@@ -728,10 +705,8 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d
else else
erp_len = 0; erp_len = 0;
crypt = ieee->crypt[ieee->tx_keyidx]; crypt = ieee->crypt[ieee->tx_keyidx];
encrypt = ieee->host_encrypt && crypt && crypt->ops && encrypt = ieee->host_encrypt && crypt && crypt->ops &&
((0 == strcmp(crypt->ops->name, "WEP") || wpa_ie_len)); ((0 == strcmp(crypt->ops->name, "WEP") || wpa_ie_len));
/* HT ralated element */ /* HT ralated element */
...@@ -742,7 +717,6 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d ...@@ -742,7 +717,6 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d
HTConstructCapabilityElement(ieee, tmp_ht_cap_buf, &tmp_ht_cap_len,encrypt); HTConstructCapabilityElement(ieee, tmp_ht_cap_buf, &tmp_ht_cap_len,encrypt);
HTConstructInfoElement(ieee,tmp_ht_info_buf,&tmp_ht_info_len, encrypt); HTConstructInfoElement(ieee,tmp_ht_info_buf,&tmp_ht_info_len, encrypt);
if (pHTInfo->bRegRT2RTAggregation) if (pHTInfo->bRegRT2RTAggregation)
{ {
tmp_generic_ie_buf = ieee->pHTInfo->szRT2RTAggBuffer; tmp_generic_ie_buf = ieee->pHTInfo->szRT2RTAggBuffer;
...@@ -787,7 +761,6 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d ...@@ -787,7 +761,6 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d
if (encrypt) if (encrypt)
beacon_buf->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY); beacon_buf->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
beacon_buf->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_PROBE_RESP); beacon_buf->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_PROBE_RESP);
beacon_buf->info_element[0].id = MFIE_TYPE_SSID; beacon_buf->info_element[0].id = MFIE_TYPE_SSID;
beacon_buf->info_element[0].len = ssid_len; beacon_buf->info_element[0].len = ssid_len;
...@@ -842,7 +815,6 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d ...@@ -842,7 +815,6 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d
return skb; return skb;
} }
static struct sk_buff *ieee80211_assoc_resp(struct ieee80211_device *ieee, static struct sk_buff *ieee80211_assoc_resp(struct ieee80211_device *ieee,
u8 *dest) u8 *dest)
{ {
...@@ -872,7 +844,6 @@ static struct sk_buff *ieee80211_assoc_resp(struct ieee80211_device *ieee, ...@@ -872,7 +844,6 @@ static struct sk_buff *ieee80211_assoc_resp(struct ieee80211_device *ieee,
assoc->capability = cpu_to_le16(ieee->iw_mode == IW_MODE_MASTER ? assoc->capability = cpu_to_le16(ieee->iw_mode == IW_MODE_MASTER ?
WLAN_CAPABILITY_BSS : WLAN_CAPABILITY_IBSS); WLAN_CAPABILITY_BSS : WLAN_CAPABILITY_IBSS);
if(ieee->short_slot) if(ieee->short_slot)
assoc->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT); assoc->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT);
...@@ -923,8 +894,6 @@ static struct sk_buff *ieee80211_auth_resp(struct ieee80211_device *ieee, ...@@ -923,8 +894,6 @@ static struct sk_buff *ieee80211_auth_resp(struct ieee80211_device *ieee,
memcpy(auth->header.addr1, dest, ETH_ALEN); memcpy(auth->header.addr1, dest, ETH_ALEN);
auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH); auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
return skb; return skb;
} }
static struct sk_buff *ieee80211_null_func(struct ieee80211_device *ieee, static struct sk_buff *ieee80211_null_func(struct ieee80211_device *ieee,
...@@ -949,11 +918,8 @@ static struct sk_buff *ieee80211_null_func(struct ieee80211_device *ieee, ...@@ -949,11 +918,8 @@ static struct sk_buff *ieee80211_null_func(struct ieee80211_device *ieee,
(pwr ? IEEE80211_FCTL_PM:0)); (pwr ? IEEE80211_FCTL_PM:0));
return skb; return skb;
} }
static void ieee80211_resp_to_assoc_rq(struct ieee80211_device *ieee, u8 *dest) static void ieee80211_resp_to_assoc_rq(struct ieee80211_device *ieee, u8 *dest)
{ {
struct sk_buff *buf = ieee80211_assoc_resp(ieee, dest); struct sk_buff *buf = ieee80211_assoc_resp(ieee, dest);
...@@ -962,7 +928,6 @@ static void ieee80211_resp_to_assoc_rq(struct ieee80211_device *ieee, u8 *dest) ...@@ -962,7 +928,6 @@ static void ieee80211_resp_to_assoc_rq(struct ieee80211_device *ieee, u8 *dest)
softmac_mgmt_xmit(buf, ieee); softmac_mgmt_xmit(buf, ieee);
} }
static void ieee80211_resp_to_auth(struct ieee80211_device *ieee, int s, static void ieee80211_resp_to_auth(struct ieee80211_device *ieee, int s,
u8 *dest) u8 *dest)
{ {
...@@ -972,17 +937,13 @@ static void ieee80211_resp_to_auth(struct ieee80211_device *ieee, int s, ...@@ -972,17 +937,13 @@ static void ieee80211_resp_to_auth(struct ieee80211_device *ieee, int s,
softmac_mgmt_xmit(buf, ieee); softmac_mgmt_xmit(buf, ieee);
} }
static void ieee80211_resp_to_probe(struct ieee80211_device *ieee, u8 *dest) static void ieee80211_resp_to_probe(struct ieee80211_device *ieee, u8 *dest)
{ {
struct sk_buff *buf = ieee80211_probe_resp(ieee, dest); struct sk_buff *buf = ieee80211_probe_resp(ieee, dest);
if (buf) if (buf)
softmac_mgmt_xmit(buf, ieee); softmac_mgmt_xmit(buf, ieee);
} }
static inline struct sk_buff * static inline struct sk_buff *
ieee80211_association_req(struct ieee80211_network *beacon, ieee80211_association_req(struct ieee80211_network *beacon,
struct ieee80211_device *ieee) struct ieee80211_device *ieee)
...@@ -1031,14 +992,12 @@ ieee80211_association_req(struct ieee80211_network *beacon, ...@@ -1031,14 +992,12 @@ ieee80211_association_req(struct ieee80211_network *beacon,
realtek_ie_buf = ieee->pHTInfo->szRT2RTAggBuffer; realtek_ie_buf = ieee->pHTInfo->szRT2RTAggBuffer;
realtek_ie_len = sizeof( ieee->pHTInfo->szRT2RTAggBuffer); realtek_ie_len = sizeof( ieee->pHTInfo->szRT2RTAggBuffer);
HTConstructRT2RTAggElement(ieee, realtek_ie_buf, &realtek_ie_len); HTConstructRT2RTAggElement(ieee, realtek_ie_buf, &realtek_ie_len);
} }
} }
if (ieee->qos_support) { if (ieee->qos_support) {
wmm_info_len = beacon->qos_data.supported?9:0; wmm_info_len = beacon->qos_data.supported?9:0;
} }
if (beacon->bCkipSupported) if (beacon->bCkipSupported)
{ {
ckip_ie_len = 30+2; ckip_ie_len = 30+2;
...@@ -1076,7 +1035,6 @@ ieee80211_association_req(struct ieee80211_network *beacon, ...@@ -1076,7 +1035,6 @@ ieee80211_association_req(struct ieee80211_network *beacon,
+ cxvernum_ie_len + cxvernum_ie_len
+ ieee->tx_headroom; + ieee->tx_headroom;
#endif #endif
skb = dev_alloc_skb(len); skb = dev_alloc_skb(len);
if (!skb) if (!skb)
...@@ -1086,7 +1044,6 @@ ieee80211_association_req(struct ieee80211_network *beacon, ...@@ -1086,7 +1044,6 @@ ieee80211_association_req(struct ieee80211_network *beacon,
hdr = skb_put(skb, sizeof(struct ieee80211_assoc_request_frame) + 2); hdr = skb_put(skb, sizeof(struct ieee80211_assoc_request_frame) + 2);
hdr->header.frame_ctl = IEEE80211_STYPE_ASSOC_REQ; hdr->header.frame_ctl = IEEE80211_STYPE_ASSOC_REQ;
hdr->header.duration_id = cpu_to_le16(37); hdr->header.duration_id = cpu_to_le16(37);
memcpy(hdr->header.addr1, beacon->bssid, ETH_ALEN); memcpy(hdr->header.addr1, beacon->bssid, ETH_ALEN);
...@@ -1182,7 +1139,6 @@ ieee80211_association_req(struct ieee80211_network *beacon, ...@@ -1182,7 +1139,6 @@ ieee80211_association_req(struct ieee80211_network *beacon,
} }
} }
//choose what wpa_supplicant gives to associate. //choose what wpa_supplicant gives to associate.
if (wpa_ie_len) { if (wpa_ie_len) {
skb_put_data(skb, ieee->wpa_ie, wpa_ie_len); skb_put_data(skb, ieee->wpa_ie, wpa_ie_len);
...@@ -1223,7 +1179,6 @@ ieee80211_association_req(struct ieee80211_network *beacon, ...@@ -1223,7 +1179,6 @@ ieee80211_association_req(struct ieee80211_network *beacon,
void ieee80211_associate_abort(struct ieee80211_device *ieee) void ieee80211_associate_abort(struct ieee80211_device *ieee)
{ {
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&ieee->lock, flags); spin_lock_irqsave(&ieee->lock, flags);
...@@ -1258,7 +1213,6 @@ static void ieee80211_associate_abort_cb(struct timer_list *t) ...@@ -1258,7 +1213,6 @@ static void ieee80211_associate_abort_cb(struct timer_list *t)
ieee80211_associate_abort(dev); ieee80211_associate_abort(dev);
} }
static void ieee80211_associate_step1(struct ieee80211_device *ieee) static void ieee80211_associate_step1(struct ieee80211_device *ieee)
{ {
struct ieee80211_network *beacon = &ieee->current_network; struct ieee80211_network *beacon = &ieee->current_network;
...@@ -1430,7 +1384,6 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee ...@@ -1430,7 +1384,6 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee
if ((ieee->iw_mode == IW_MODE_ADHOC) && !(net->capability & WLAN_CAPABILITY_IBSS)) if ((ieee->iw_mode == IW_MODE_ADHOC) && !(net->capability & WLAN_CAPABILITY_IBSS))
return; return;
if (ieee->iw_mode == IW_MODE_INFRA || ieee->iw_mode == IW_MODE_ADHOC) { if (ieee->iw_mode == IW_MODE_INFRA || ieee->iw_mode == IW_MODE_ADHOC) {
/* if the user specified the AP MAC, we need also the essid /* if the user specified the AP MAC, we need also the essid
* This could be obtained by beacons or, if the network does not * This could be obtained by beacons or, if the network does not
...@@ -1443,7 +1396,6 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee ...@@ -1443,7 +1396,6 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee
ssidmatch = (ieee->current_network.ssid_len == net->ssid_len)&&\ ssidmatch = (ieee->current_network.ssid_len == net->ssid_len)&&\
(!strncmp(ieee->current_network.ssid, net->ssid, net->ssid_len)); (!strncmp(ieee->current_network.ssid, net->ssid, net->ssid_len));
if ( /* if the user set the AP check if match. if ( /* if the user set the AP check if match.
* if the network does not broadcast essid we check the user supplyed ANY essid * if the network does not broadcast essid we check the user supplyed ANY essid
* if the network does broadcast and the user does not set essid it is OK * if the network does broadcast and the user does not set essid it is OK
...@@ -1505,10 +1457,8 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee ...@@ -1505,10 +1457,8 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee
//HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); //HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
ieee->state = IEEE80211_LINKED; ieee->state = IEEE80211_LINKED;
} }
} }
} }
} }
void ieee80211_softmac_check_all_nets(struct ieee80211_device *ieee) void ieee80211_softmac_check_all_nets(struct ieee80211_device *ieee)
...@@ -1532,10 +1482,8 @@ void ieee80211_softmac_check_all_nets(struct ieee80211_device *ieee) ...@@ -1532,10 +1482,8 @@ void ieee80211_softmac_check_all_nets(struct ieee80211_device *ieee)
} }
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);
} }
static inline u16 auth_parse(struct sk_buff *skb, u8 **challenge, int *chlen) static inline u16 auth_parse(struct sk_buff *skb, u8 **challenge, int *chlen)
{ {
struct ieee80211_authentication *a; struct ieee80211_authentication *a;
...@@ -1558,10 +1506,8 @@ static inline u16 auth_parse(struct sk_buff *skb, u8 **challenge, int *chlen) ...@@ -1558,10 +1506,8 @@ static inline u16 auth_parse(struct sk_buff *skb, u8 **challenge, int *chlen)
} }
return le16_to_cpu(a->status); return le16_to_cpu(a->status);
} }
static int auth_rq_parse(struct sk_buff *skb, u8 *dest) static int auth_rq_parse(struct sk_buff *skb, u8 *dest)
{ {
struct ieee80211_authentication *a; struct ieee80211_authentication *a;
...@@ -1615,7 +1561,6 @@ static short probe_rq_parse(struct ieee80211_device *ieee, struct sk_buff *skb, ...@@ -1615,7 +1561,6 @@ static short probe_rq_parse(struct ieee80211_device *ieee, struct sk_buff *skb,
if (!ssid) return 1; /* ssid not found in tagged param */ if (!ssid) return 1; /* ssid not found in tagged param */
return (!strncmp(ssid, ieee->current_network.ssid, ssidlen)); return (!strncmp(ssid, ieee->current_network.ssid, ssidlen));
} }
static int assoc_rq_parse(struct sk_buff *skb, u8 *dest) static int assoc_rq_parse(struct sk_buff *skb, u8 *dest)
...@@ -1697,7 +1642,6 @@ ieee80211_rx_auth_rq(struct ieee80211_device *ieee, struct sk_buff *skb) ...@@ -1697,7 +1642,6 @@ ieee80211_rx_auth_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
static inline void static inline void
ieee80211_rx_assoc_rq(struct ieee80211_device *ieee, struct sk_buff *skb) ieee80211_rx_assoc_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
{ {
u8 dest[ETH_ALEN]; u8 dest[ETH_ALEN];
//unsigned long flags; //unsigned long flags;
...@@ -1713,7 +1657,6 @@ ieee80211_rx_assoc_rq(struct ieee80211_device *ieee, struct sk_buff *skb) ...@@ -1713,7 +1657,6 @@ ieee80211_rx_assoc_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
static void ieee80211_sta_ps_send_null_frame(struct ieee80211_device *ieee, static void ieee80211_sta_ps_send_null_frame(struct ieee80211_device *ieee,
short pwr) short pwr)
{ {
struct sk_buff *buf = ieee80211_null_func(ieee, pwr); struct sk_buff *buf = ieee80211_null_func(ieee, pwr);
if (buf) if (buf)
...@@ -1767,13 +1710,10 @@ static short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h, ...@@ -1767,13 +1710,10 @@ static short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h,
} }
return 1; return 1;
} }
static inline void ieee80211_sta_ps(struct ieee80211_device *ieee) static inline void ieee80211_sta_ps(struct ieee80211_device *ieee)
{ {
u32 th, tl; u32 th, tl;
short sleep; short sleep;
...@@ -1799,7 +1739,6 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee) ...@@ -1799,7 +1739,6 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee)
goto out; goto out;
if(sleep == 1){ if(sleep == 1){
if(ieee->sta_sleep == 1) if(ieee->sta_sleep == 1)
ieee->enter_sleep_state(ieee->dev, th, tl); ieee->enter_sleep_state(ieee->dev, th, tl);
...@@ -1808,8 +1747,6 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee) ...@@ -1808,8 +1747,6 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee)
spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2); spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
if(ieee->ps_is_queue_empty(ieee->dev)){ if(ieee->ps_is_queue_empty(ieee->dev)){
ieee->sta_sleep = 2; ieee->sta_sleep = 2;
ieee->ps_request_tx_ack(ieee->dev); ieee->ps_request_tx_ack(ieee->dev);
...@@ -1820,10 +1757,7 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee) ...@@ -1820,10 +1757,7 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee)
ieee->ps_tl = tl; ieee->ps_tl = tl;
} }
spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags2); spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags2);
} }
}else if(sleep == 2){ }else if(sleep == 2){
//#warning CHECK_LOCK_HERE //#warning CHECK_LOCK_HERE
spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2); spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
...@@ -1832,10 +1766,8 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee) ...@@ -1832,10 +1766,8 @@ static inline void ieee80211_sta_ps(struct ieee80211_device *ieee)
spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags2); spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags2);
} }
out: out:
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);
} }
void ieee80211_sta_wakeup(struct ieee80211_device *ieee, short nl) void ieee80211_sta_wakeup(struct ieee80211_device *ieee, short nl)
...@@ -1847,7 +1779,6 @@ void ieee80211_sta_wakeup(struct ieee80211_device *ieee, short nl) ...@@ -1847,7 +1779,6 @@ void ieee80211_sta_wakeup(struct ieee80211_device *ieee, short nl)
ieee80211_sta_ps_send_null_frame(ieee, 0); ieee80211_sta_ps_send_null_frame(ieee, 0);
} }
return; return;
} }
if(ieee->sta_sleep == 1) if(ieee->sta_sleep == 1)
...@@ -1879,7 +1810,6 @@ void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success) ...@@ -1879,7 +1810,6 @@ void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success)
} }
/* 21112005 - tx again null without PS bit if lost */ /* 21112005 - tx again null without PS bit if lost */
else { else {
if ((ieee->sta_sleep == 0) && !success) { if ((ieee->sta_sleep == 0) && !success) {
spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2); spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
ieee80211_sta_ps_send_null_frame(ieee, 0); ieee80211_sta_ps_send_null_frame(ieee, 0);
...@@ -1917,7 +1847,6 @@ static void ieee80211_process_action(struct ieee80211_device *ieee, ...@@ -1917,7 +1847,6 @@ static void ieee80211_process_action(struct ieee80211_device *ieee,
break; break;
} }
return; return;
} }
static void ieee80211_check_auth_response(struct ieee80211_device *ieee, static void ieee80211_check_auth_response(struct ieee80211_device *ieee,
...@@ -2004,10 +1933,8 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, ...@@ -2004,10 +1933,8 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
ieee->last_rx_ps_time = jiffies; ieee->last_rx_ps_time = jiffies;
switch (WLAN_FC_GET_STYPE(header->frame_ctl)) { switch (WLAN_FC_GET_STYPE(header->frame_ctl)) {
case IEEE80211_STYPE_ASSOC_RESP: case IEEE80211_STYPE_ASSOC_RESP:
case IEEE80211_STYPE_REASSOC_RESP: case IEEE80211_STYPE_REASSOC_RESP:
IEEE80211_DEBUG_MGMT("received [RE]ASSOCIATION RESPONSE (%d)\n", IEEE80211_DEBUG_MGMT("received [RE]ASSOCIATION RESPONSE (%d)\n",
WLAN_FC_GET_STYPE(header->frame_ctl)); WLAN_FC_GET_STYPE(header->frame_ctl));
if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) && if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
...@@ -2060,7 +1987,6 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, ...@@ -2060,7 +1987,6 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
case IEEE80211_STYPE_ASSOC_REQ: case IEEE80211_STYPE_ASSOC_REQ:
case IEEE80211_STYPE_REASSOC_REQ: case IEEE80211_STYPE_REASSOC_REQ:
if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) && if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
ieee->iw_mode == IW_MODE_MASTER) ieee->iw_mode == IW_MODE_MASTER)
...@@ -2068,7 +1994,6 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, ...@@ -2068,7 +1994,6 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
break; break;
case IEEE80211_STYPE_AUTH: case IEEE80211_STYPE_AUTH:
if (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) { if (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) {
if (ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATING if (ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATING
&& ieee->iw_mode == IW_MODE_INFRA) { && ieee->iw_mode == IW_MODE_INFRA) {
...@@ -2082,7 +2007,6 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, ...@@ -2082,7 +2007,6 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
break; break;
case IEEE80211_STYPE_PROBE_REQ: case IEEE80211_STYPE_PROBE_REQ:
if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) && if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) &&
((ieee->iw_mode == IW_MODE_ADHOC || ((ieee->iw_mode == IW_MODE_ADHOC ||
ieee->iw_mode == IW_MODE_MASTER) && ieee->iw_mode == IW_MODE_MASTER) &&
...@@ -2140,7 +2064,6 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, ...@@ -2140,7 +2064,6 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
*/ */
void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *ieee) void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *ieee)
{ {
unsigned int queue_index = txb->queue_index; unsigned int queue_index = txb->queue_index;
unsigned long flags; unsigned long flags;
int i; int i;
...@@ -2215,12 +2138,10 @@ static void ieee80211_resume_tx(struct ieee80211_device *ieee) ...@@ -2215,12 +2138,10 @@ static void ieee80211_resume_tx(struct ieee80211_device *ieee)
} }
} }
ieee80211_txb_free(ieee->tx_pending.txb); ieee80211_txb_free(ieee->tx_pending.txb);
ieee->tx_pending.txb = NULL; ieee->tx_pending.txb = NULL;
} }
void ieee80211_reset_queue(struct ieee80211_device *ieee) void ieee80211_reset_queue(struct ieee80211_device *ieee)
{ {
unsigned long flags; unsigned long flags;
...@@ -2233,13 +2154,11 @@ void ieee80211_reset_queue(struct ieee80211_device *ieee) ...@@ -2233,13 +2154,11 @@ void ieee80211_reset_queue(struct ieee80211_device *ieee)
} }
ieee->queue_stop = 0; ieee->queue_stop = 0;
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);
} }
EXPORT_SYMBOL(ieee80211_reset_queue); EXPORT_SYMBOL(ieee80211_reset_queue);
void ieee80211_wake_queue(struct ieee80211_device *ieee) void ieee80211_wake_queue(struct ieee80211_device *ieee)
{ {
unsigned long flags; unsigned long flags;
struct sk_buff *skb; struct sk_buff *skb;
struct rtl_80211_hdr_3addr *header; struct rtl_80211_hdr_3addr *header;
...@@ -2272,7 +2191,6 @@ void ieee80211_wake_queue(struct ieee80211_device *ieee) ...@@ -2272,7 +2191,6 @@ void ieee80211_wake_queue(struct ieee80211_device *ieee)
ieee->softmac_stats.swtxawake++; ieee->softmac_stats.swtxawake++;
netif_wake_queue(ieee->dev); netif_wake_queue(ieee->dev);
} }
exit : exit :
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);
} }
...@@ -2289,7 +2207,6 @@ void ieee80211_stop_queue(struct ieee80211_device *ieee) ...@@ -2289,7 +2207,6 @@ void ieee80211_stop_queue(struct ieee80211_device *ieee)
} }
ieee->queue_stop = 1; ieee->queue_stop = 1;
//spin_unlock_irqrestore(&ieee->lock,flags); //spin_unlock_irqrestore(&ieee->lock,flags);
} }
EXPORT_SYMBOL(ieee80211_stop_queue); EXPORT_SYMBOL(ieee80211_stop_queue);
...@@ -2332,7 +2249,6 @@ static void ieee80211_start_monitor_mode(struct ieee80211_device *ieee) ...@@ -2332,7 +2249,6 @@ static void ieee80211_start_monitor_mode(struct ieee80211_device *ieee)
} }
static void ieee80211_start_ibss_wq(struct work_struct *work) static void ieee80211_start_ibss_wq(struct work_struct *work)
{ {
struct delayed_work *dwork = to_delayed_work(work); struct delayed_work *dwork = to_delayed_work(work);
struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, start_ibss_wq); struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, start_ibss_wq);
/* iwconfig mode ad-hoc will schedule this and return /* iwconfig mode ad-hoc will schedule this and return
...@@ -2357,7 +2273,6 @@ static void ieee80211_start_ibss_wq(struct work_struct *work) ...@@ -2357,7 +2273,6 @@ static void ieee80211_start_ibss_wq(struct work_struct *work)
/* check if we have this cell in our network list */ /* check if we have this cell in our network list */
ieee80211_softmac_check_all_nets(ieee); ieee80211_softmac_check_all_nets(ieee);
// if((IS_DOT11D_ENABLE(ieee)) && (ieee->state == IEEE80211_NOLINK)) // if((IS_DOT11D_ENABLE(ieee)) && (ieee->state == IEEE80211_NOLINK))
if (ieee->state == IEEE80211_NOLINK) if (ieee->state == IEEE80211_NOLINK)
ieee->current_network.channel = 6; ieee->current_network.channel = 6;
...@@ -2392,7 +2307,6 @@ static void ieee80211_start_ibss_wq(struct work_struct *work) ...@@ -2392,7 +2307,6 @@ static void ieee80211_start_ibss_wq(struct work_struct *work)
ieee->current_network.rates[1] = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_2MB; ieee->current_network.rates[1] = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_2MB;
ieee->current_network.rates[2] = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_5MB; ieee->current_network.rates[2] = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_5MB;
ieee->current_network.rates[3] = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_11MB; ieee->current_network.rates[3] = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_11MB;
}else }else
ieee->current_network.rates_len = 0; ieee->current_network.rates_len = 0;
...@@ -2486,8 +2400,6 @@ void ieee80211_start_bss(struct ieee80211_device *ieee) ...@@ -2486,8 +2400,6 @@ void ieee80211_start_bss(struct ieee80211_device *ieee)
/* called only in userspace context */ /* called only in userspace context */
void ieee80211_disassociate(struct ieee80211_device *ieee) void ieee80211_disassociate(struct ieee80211_device *ieee)
{ {
netif_carrier_off(ieee->dev); netif_carrier_off(ieee->dev);
if (ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE) if (ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE)
ieee80211_reset_queue(ieee); ieee80211_reset_queue(ieee);
...@@ -2501,7 +2413,6 @@ void ieee80211_disassociate(struct ieee80211_device *ieee) ...@@ -2501,7 +2413,6 @@ void ieee80211_disassociate(struct ieee80211_device *ieee)
ieee->link_change(ieee->dev); ieee->link_change(ieee->dev);
//HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); //HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
notify_wx_assoc_event(ieee); notify_wx_assoc_event(ieee);
} }
EXPORT_SYMBOL(ieee80211_disassociate); EXPORT_SYMBOL(ieee80211_disassociate);
...@@ -2562,7 +2473,6 @@ struct sk_buff *ieee80211_get_beacon_(struct ieee80211_device *ieee) ...@@ -2562,7 +2473,6 @@ struct sk_buff *ieee80211_get_beacon_(struct ieee80211_device *ieee)
b->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_BEACON); b->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_BEACON);
return skb; return skb;
} }
struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee) struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee)
...@@ -2653,7 +2563,6 @@ void ieee80211_start_protocol(struct ieee80211_device *ieee) ...@@ -2653,7 +2563,6 @@ void ieee80211_start_protocol(struct ieee80211_device *ieee)
ieee->init_wmmparam_flag = 0;//reinitialize AC_xx_PARAM registers. ieee->init_wmmparam_flag = 0;//reinitialize AC_xx_PARAM registers.
/* if the user set the MAC of the ad-hoc cell and then /* if the user set the MAC of the ad-hoc cell and then
* switch to managed mode, shall we make sure that association * switch to managed mode, shall we make sure that association
* attempts does not fail just because the user provide the essid * attempts does not fail just because the user provide the essid
...@@ -2672,7 +2581,6 @@ void ieee80211_start_protocol(struct ieee80211_device *ieee) ...@@ -2672,7 +2581,6 @@ void ieee80211_start_protocol(struct ieee80211_device *ieee)
ieee80211_start_monitor_mode(ieee); ieee80211_start_monitor_mode(ieee);
} }
#define DRV_NAME "Ieee80211" #define DRV_NAME "Ieee80211"
void ieee80211_softmac_init(struct ieee80211_device *ieee) void ieee80211_softmac_init(struct ieee80211_device *ieee)
{ {
...@@ -2724,7 +2632,6 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee) ...@@ -2724,7 +2632,6 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)
timer_setup(&ieee->beacon_timer, ieee80211_send_beacon_cb, 0); timer_setup(&ieee->beacon_timer, ieee80211_send_beacon_cb, 0);
INIT_DELAYED_WORK(&ieee->start_ibss_wq, ieee80211_start_ibss_wq); INIT_DELAYED_WORK(&ieee->start_ibss_wq, ieee80211_start_ibss_wq);
INIT_WORK(&ieee->associate_complete_wq, ieee80211_associate_complete_wq); INIT_WORK(&ieee->associate_complete_wq, ieee80211_associate_complete_wq);
INIT_WORK(&ieee->associate_procedure_wq, ieee80211_associate_procedure_wq); INIT_WORK(&ieee->associate_procedure_wq, ieee80211_associate_procedure_wq);
...@@ -2732,7 +2639,6 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee) ...@@ -2732,7 +2639,6 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)
INIT_DELAYED_WORK(&ieee->associate_retry_wq, ieee80211_associate_retry_wq); INIT_DELAYED_WORK(&ieee->associate_retry_wq, ieee80211_associate_retry_wq);
INIT_WORK(&ieee->wx_sync_scan_wq, ieee80211_wx_sync_scan_wq); INIT_WORK(&ieee->wx_sync_scan_wq, ieee80211_wx_sync_scan_wq);
mutex_init(&ieee->wx_mutex); mutex_init(&ieee->wx_mutex);
mutex_init(&ieee->scan_mutex); mutex_init(&ieee->scan_mutex);
...@@ -2742,7 +2648,6 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee) ...@@ -2742,7 +2648,6 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)
tasklet_init(&ieee->ps_task, tasklet_init(&ieee->ps_task,
(void(*)(unsigned long)) ieee80211_sta_ps, (void(*)(unsigned long)) ieee80211_sta_ps,
(unsigned long)ieee); (unsigned long)ieee);
} }
void ieee80211_softmac_free(struct ieee80211_device *ieee) void ieee80211_softmac_free(struct ieee80211_device *ieee)
...@@ -2761,8 +2666,6 @@ void ieee80211_softmac_free(struct ieee80211_device *ieee) ...@@ -2761,8 +2666,6 @@ void ieee80211_softmac_free(struct ieee80211_device *ieee)
* Start of WPA code. * * Start of WPA code. *
* this is stolen from the ipw2200 driver * * this is stolen from the ipw2200 driver *
********************************************************/ ********************************************************/
static int ieee80211_wpa_enable(struct ieee80211_device *ieee, int value) static int ieee80211_wpa_enable(struct ieee80211_device *ieee, int value)
{ {
/* This is called when wpa_supplicant loads and closes the driver /* This is called when wpa_supplicant loads and closes the driver
...@@ -2772,7 +2675,6 @@ static int ieee80211_wpa_enable(struct ieee80211_device *ieee, int value) ...@@ -2772,7 +2675,6 @@ static int ieee80211_wpa_enable(struct ieee80211_device *ieee, int value)
return 0; return 0;
} }
static void ieee80211_wpa_assoc_frame(struct ieee80211_device *ieee, static void ieee80211_wpa_assoc_frame(struct ieee80211_device *ieee,
char *wpa_ie, int wpa_ie_len) char *wpa_ie, int wpa_ie_len)
{ {
...@@ -2782,10 +2684,8 @@ static void ieee80211_wpa_assoc_frame(struct ieee80211_device *ieee, ...@@ -2782,10 +2684,8 @@ static void ieee80211_wpa_assoc_frame(struct ieee80211_device *ieee,
ieee80211_disassociate(ieee); ieee80211_disassociate(ieee);
} }
static int ieee80211_wpa_mlme(struct ieee80211_device *ieee, int command, int reason) static int ieee80211_wpa_mlme(struct ieee80211_device *ieee, int command, int reason)
{ {
int ret = 0; int ret = 0;
switch (command) { switch (command) {
...@@ -2805,7 +2705,6 @@ static int ieee80211_wpa_mlme(struct ieee80211_device *ieee, int command, int re ...@@ -2805,7 +2705,6 @@ static int ieee80211_wpa_mlme(struct ieee80211_device *ieee, int command, int re
return ret; return ret;
} }
static int ieee80211_wpa_set_wpa_ie(struct ieee80211_device *ieee, static int ieee80211_wpa_set_wpa_ie(struct ieee80211_device *ieee,
struct ieee_param *param, int plen) struct ieee_param *param, int plen)
{ {
...@@ -2839,7 +2738,6 @@ static int ieee80211_wpa_set_wpa_ie(struct ieee80211_device *ieee, ...@@ -2839,7 +2738,6 @@ static int ieee80211_wpa_set_wpa_ie(struct ieee80211_device *ieee,
static int ieee80211_wpa_set_auth_algs(struct ieee80211_device *ieee, int value) static int ieee80211_wpa_set_auth_algs(struct ieee80211_device *ieee, int value)
{ {
struct ieee80211_security sec = { struct ieee80211_security sec = {
.flags = SEC_AUTH_MODE, .flags = SEC_AUTH_MODE,
}; };
...@@ -2859,7 +2757,6 @@ static int ieee80211_wpa_set_auth_algs(struct ieee80211_device *ieee, int value) ...@@ -2859,7 +2757,6 @@ static int ieee80211_wpa_set_auth_algs(struct ieee80211_device *ieee, int value)
ieee->auth_mode = 2; ieee->auth_mode = 2;
} }
if (ieee->set_security) if (ieee->set_security)
ieee->set_security(ieee->dev, &sec); ieee->set_security(ieee->dev, &sec);
//else //else
...@@ -2943,7 +2840,6 @@ static int ieee80211_wpa_set_param(struct ieee80211_device *ieee, u8 name, u32 v ...@@ -2943,7 +2840,6 @@ static int ieee80211_wpa_set_param(struct ieee80211_device *ieee, u8 name, u32 v
} }
/* implementation borrowed from hostap driver */ /* implementation borrowed from hostap driver */
static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee, static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee,
struct ieee_param *param, int param_len) struct ieee_param *param, int param_len)
{ {
...@@ -3117,7 +3013,6 @@ static inline struct sk_buff *ieee80211_disassociate_skb( ...@@ -3117,7 +3013,6 @@ static inline struct sk_buff *ieee80211_disassociate_skb(
return skb; return skb;
} }
void void
SendDisassociation( SendDisassociation(
struct ieee80211_device *ieee, struct ieee80211_device *ieee,
......
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