skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-06 21:43:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove double blank lines in core/*.h

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-08-15 13:44:41 -05:00
parent 51e6fae39e
commit 11ab93f073
21 changed files with 0 additions and 462 deletions
Download patch file Download diff file Expand all files Collapse all files

56
core/rtw_mlme.c
View file

@ -19,7 +19,6 @@
******************************************************************************/
#define _RTW_MLME_C_
#include <drv_conf.h>
#include <osdep_service.h>
#include <drv_types.h>
@ -267,7 +266,6 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv , struct wlan_network *pnetwo
pmlmepriv->num_of_scanned --;
/* DBG_871X("_rtw_free_network:SSID =%s\n", pnetwork->network.Ssid.Ssid); */
spin_unlock_bh(&free_queue->lock);
@ -307,7 +305,6 @@ exit:
}
/*
return the wlan_network with the matching addr
@ -356,7 +353,6 @@ exit:
}
void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)
{
unsigned long irqL;
@ -367,7 +363,6 @@ void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)
;
spin_lock_bh(&scanned_queue->lock);
phead = get_list_head(scanned_queue);
@ -390,9 +385,6 @@ void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)
}
sint rtw_if_up(struct adapter *padapter) {
sint res;
@ -410,7 +402,6 @@ sint rtw_if_up(struct adapter *padapter) {
return res;
}
void rtw_generate_random_ibss(u8* pibss)
{
u32 curtime = rtw_get_current_time();
@ -431,7 +422,6 @@ u8 *rtw_get_capability_from_ie(u8 *ie)
return (ie + 8 + 2);
}
u16 rtw_get_capability(struct wlan_bssid_ex *bss)
{
__le16 val;
@ -450,7 +440,6 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie)
return (ie + 8);
}
int rtw_init_mlme_priv (struct adapter *padapter)/* struct mlme_priv *pmlmepriv) */
{
int res;
@ -502,7 +491,6 @@ void rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *p
;
}
void rtw_free_network_queue(struct adapter* dev, u8 isfreeall)
{
;
@ -562,7 +550,6 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea
memcpy((u8 *)&ls_cap, rtw_get_capability_from_ie(src->IEs), 2);
memcpy((u8 *)&ld_cap, rtw_get_capability_from_ie(dst->IEs), 2);
s_cap = le16_to_cpu(ls_cap);
d_cap = le16_to_cpu(ld_cap);
@ -705,12 +692,10 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex
}
/*
Caller must hold pmlmepriv->lock first.
*/
void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target)
{
@ -764,7 +749,6 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
}
/* If we didn't find a match, then get a new network slot to initialize
* with this beacon's information */
/* if (rtw_end_of_queue_search(phead, plist) == true) { */
@ -910,7 +894,6 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor
}
}
if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy == 0)) {
DBG_871X("desired_encmode: %d, privacy: %d\n", desired_encmode, privacy);
bselected = false;
@ -922,7 +905,6 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor
bselected = false;
}
return bselected;
}
@ -936,7 +918,6 @@ void rtw_atimdone_event_callback(struct adapter *adapter , u8 *pbuf)
return;
}
void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)
{
unsigned long irqL;
@ -957,7 +938,6 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)
return;
}
spin_lock_bh(&pmlmepriv->lock);
/* update IBSS_network 's timestamp */
@ -1001,8 +981,6 @@ exit:
return;
}
void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
{
unsigned long irqL;
@ -1046,7 +1024,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
if (timer_cancelled)
_cancel_timer(&pmlmepriv->scan_to_timer, &timer_cancelled);
spin_lock_bh(&pmlmepriv->lock);
rtw_set_signal_stat_timer(&adapter->recvpriv);
@ -1254,7 +1231,6 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("rtw_free_assoc_resources : pwlan == NULL\n\n"));
}
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) && (adapter->stapriv.asoc_sta_count == 1))
/*||check_fwstate(pmlmepriv, WIFI_STATION_STATE)*/)
{
@ -1287,7 +1263,6 @@ void rtw_indicate_connect(struct adapter *padapter)
rtw_led_control(padapter, LED_CTL_LINK);
#ifdef CONFIG_DRVEXT_MODULE
if (padapter->drvextpriv.enable_wpa)
{
@ -1439,7 +1414,6 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
padapter->securitypriv.wps_ie_len = 0;
}
/* for A-MPDU Rx reordering buffer control for bmc_sta & sta_info */
/* if A-MPDU Rx is enabled, reseting rx_ordering_ctrl wstart_b(indicate_seq) to default value =0xffff */
/* todo: check if AP can send A-MPDU packets */
@ -1457,7 +1431,6 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
preorder_ctrl->wsize_b = 64;/* max_ampdu_sz; ex. 32(kbytes) -> wsize_b =32 */
}
bmc_sta = rtw_get_bcmc_stainfo(padapter);
if (bmc_sta)
{
@ -1476,7 +1449,6 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
}
}
/* misc. */
update_sta_info(padapter, psta);
@ -1498,7 +1470,6 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("\nfw_state:%x, BSSID:"MAC_FMT"\n"
, get_fwstate(pmlmepriv), MAC_ARG(pnetwork->network.MacAddress)));
/* why not use ptarget_wlan?? */
memcpy(&cur_network->network, &pnetwork->network, pnetwork->network.Length);
/* some IEs in pnetwork is wrong, so we should use ptarget_wlan IEs */
@ -1507,7 +1478,6 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net
cur_network->aid = pnetwork->join_res;
rtw_set_signal_stat_timer(&padapter->recvpriv);
padapter->recvpriv.signal_strength = ptarget_wlan->network.PhyInfo.SignalStrength;
padapter->recvpriv.signal_qual = ptarget_wlan->network.PhyInfo.SignalQuality;
@ -1573,7 +1543,6 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
rtw_get_encrypt_decrypt_from_registrypriv(adapter);
if (pmlmepriv->assoc_ssid.SsidLength == 0)
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("@@@@@ joinbss event call back for Any SSid\n"));
else
@ -1634,7 +1603,6 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
goto exit_unlock;
}
/* s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
ptarget_sta = rtw_joinbss_update_stainfo(adapter, pnetwork);
@ -1860,7 +1828,6 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
if (adapter->securitypriv.dot11AuthAlgrthm ==dot11AuthAlgrthm_8021X)
psta->dot118021XPrivacy = adapter->securitypriv.dot11PrivacyAlgrthm;
psta->ieee8021x_blocked = false;
spin_lock_bh(&pmlmepriv->lock);
@ -1882,7 +1849,6 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
spin_unlock_bh(&pmlmepriv->lock);
mlmeext_sta_add_event_callback(adapter, psta);
exit:
@ -1926,7 +1892,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
return;
}
mlmeext_sta_del_event_callback(adapter);
spin_lock_bh(&pmlmepriv->lock);
@ -2003,7 +1968,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
}
}
}
@ -2032,7 +1996,6 @@ void _rtw_join_timeout_handler (struct adapter *adapter)
if (adapter->bDriverStopped ||adapter->bSurpriseRemoved)
return;
spin_lock_bh(&pmlmepriv->lock);
if (rtw_to_roaming(adapter) > 0) { /* join timeout caused by roaming */
@ -2061,7 +2024,6 @@ void _rtw_join_timeout_handler (struct adapter *adapter)
spin_unlock_bh(&pmlmepriv->lock);
#ifdef CONFIG_DRVEXT_MODULE_WSC
drvext_assoc_fail_indicate(&adapter->drvextpriv);
#endif
@ -2184,7 +2146,6 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
}
inline bool rtw_is_scan_deny(struct adapter *adapter)
{
struct mlme_priv *mlmepriv = &adapter->mlmepriv;
@ -2228,7 +2189,6 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
int updated = false;
struct adapter *adapter = container_of(pmlmepriv, struct adapter, mlmepriv);
/* check bssid, if needed */
if (pmlmepriv->assoc_by_bssid ==true) {
if (_rtw_memcmp(competitor->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN) ==false)
@ -2283,7 +2243,6 @@ The caller must hold the following spinlock
pmlmepriv->lock
*/
int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
@ -2330,7 +2289,6 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
candidate->network.Configuration.DSConfig);
}
/* check for situation of _FW_LINKED */
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
DBG_871X("%s: _FW_LINKED while ask_for_joinbss!!!\n", __FUNCTION__);
@ -2392,7 +2350,6 @@ sint rtw_set_auth(struct adapter * adapter, struct security_priv *psecuritypriv)
pcmd->rsp = NULL;
pcmd->rspsz = 0;
_rtw_init_listhead(&pcmd->list);
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("after enqueue set_auth_cmd, auth_mode =%x\n", psecuritypriv->dot11AuthAlgrthm));
@ -2407,7 +2364,6 @@ exit:
}
sint rtw_set_key(struct adapter * adapter, struct security_priv *psecuritypriv, sint keyid, u8 set_tx, bool enqueue)
{
u8 keylen;
@ -2470,7 +2426,6 @@ sint rtw_set_key(struct adapter * adapter, struct security_priv *psecuritypriv,
goto exit;
}
if (enqueue) {
pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
if (pcmd == NULL) {
@ -2501,7 +2456,6 @@ exit:
}
/* adjust IEs for rtw_joinbss_cmd in WMM */
int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint initial_out_len)
{
@ -2535,7 +2489,6 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_
}
/* */
/* Ported from 8185: IsInPreAuthKeyList(). (Renamed from SecIsInPreAuthKeyList(), 2006-10-13.) */
/* Added by Annie, 2006-05-07. */
@ -2698,7 +2651,6 @@ void rtw_init_registrypriv_dev_network( struct adapter* adapter)
pdev_network->Configuration.FHConfig.HopSet = 0;
pdev_network->Configuration.FHConfig.DwellTime = 0;
;
}
@ -2810,7 +2762,6 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
struct qos_priv *pqospriv = &pmlmepriv->qospriv;
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
phtpriv->ht_option = false;
p = rtw_get_ie(in_ie+12, _HT_CAPABILITY_IE_, &ielen, in_len-12);
@ -2834,7 +2785,6 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_TX_STBC |
IEEE80211_HT_CAP_DSSSCCK40);
{
u32 rx_packet_offset, max_recvbuf_sz;
rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset);
@ -2849,7 +2799,6 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
else
ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&0x00);
pframe = rtw_set_ie(out_ie+out_len, _HT_CAPABILITY_IE_,
sizeof(struct ieee80211_ht_cap), (unsigned char*)&ht_capie, pout_len);
@ -2885,7 +2834,6 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
if (!phtpriv->ht_option)
return;
@ -2911,7 +2859,6 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len)
phtpriv->ampdu_enable = true;
}
/* check Max Rx A-MPDU Size */
len = 0;
p = rtw_get_ie(pie+sizeof (struct ndis_802_11_fixed_ies), _HT_CAPABILITY_IE_, &len, ie_len-sizeof (struct ndis_802_11_fixed_ies));
@ -2926,7 +2873,6 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len)
}
len =0;
p = rtw_get_ie(pie+sizeof (struct ndis_802_11_fixed_ies), _HT_ADD_INFO_IE_, &len, ie_len-sizeof (struct ndis_802_11_fixed_ies));
if (p && len>0)
@ -2935,7 +2881,6 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len)
/* todo: */
}
/* update cur_bwmode & cur_ch_offset */
if ((pregistrypriv->cbw40_enable) &&
(le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & BIT(1)) &&
@ -3020,7 +2965,6 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
return;
}
phtpriv = &psta->htpriv;
if ((phtpriv->ht_option ==true) && (phtpriv->ampdu_enable ==true))