staging: rtl8188eu: cleanup declarations in rtw_mlme.c
Replace tabs with spaces, remove spaces, remove blank lines and break lines appropriatly in declarations. Signed-off-by: Michael Straube <straube.linux@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michael Straube
Greg Kroah-Hartman
parent
2077ca1cd4
commit
794f816566
@ -24,11 +24,11 @@ extern const u8 MCS_rate_1R[16];
|
||||
|
||||
int rtw_init_mlme_priv(struct adapter *padapter)
|
||||
{
|
||||
int i;
|
||||
u8 *pbuf;
|
||||
struct wlan_network *pnetwork;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
int res = _SUCCESS;
|
||||
int i;
|
||||
u8 *pbuf;
|
||||
struct wlan_network *pnetwork;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
int res = _SUCCESS;
|
||||
|
||||
/* We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */
|
||||
|
||||
@ -179,7 +179,7 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *
|
||||
struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *addr)
|
||||
{
|
||||
struct list_head *phead, *plist;
|
||||
struct wlan_network *pnetwork = NULL;
|
||||
struct wlan_network *pnetwork = NULL;
|
||||
u8 zero_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
|
||||
|
||||
if (!memcmp(zero_addr, addr, ETH_ALEN)) {
|
||||
@ -259,7 +259,7 @@ u8 *rtw_get_capability_from_ie(u8 *ie)
|
||||
|
||||
u16 rtw_get_capability(struct wlan_bssid_ex *bss)
|
||||
{
|
||||
__le16 val;
|
||||
__le16 val;
|
||||
|
||||
memcpy((u8 *)&val, rtw_get_capability_from_ie(bss->ies), 2);
|
||||
|
||||
@ -327,8 +327,8 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst)
|
||||
struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue)
|
||||
{
|
||||
struct list_head *plist, *phead;
|
||||
struct wlan_network *pwlan = NULL;
|
||||
struct wlan_network *oldest = NULL;
|
||||
struct wlan_network *pwlan = NULL;
|
||||
struct wlan_network *oldest = NULL;
|
||||
|
||||
phead = get_list_head(scanned_queue);
|
||||
|
||||
@ -402,11 +402,11 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex
|
||||
void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target)
|
||||
{
|
||||
struct list_head *plist, *phead;
|
||||
u32 bssid_ex_sz;
|
||||
u32 bssid_ex_sz;
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
struct __queue *queue = &pmlmepriv->scanned_queue;
|
||||
struct wlan_network *pnetwork = NULL;
|
||||
struct wlan_network *oldest = NULL;
|
||||
struct wlan_network *pnetwork = NULL;
|
||||
struct wlan_network *oldest = NULL;
|
||||
|
||||
spin_lock_bh(&queue->lock);
|
||||
phead = get_list_head(queue);
|
||||
@ -722,7 +722,7 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv)
|
||||
*/
|
||||
void rtw_free_assoc_resources(struct adapter *adapter)
|
||||
{
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
|
||||
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
|
||||
rtw_free_assoc_resources_locked(adapter);
|
||||
@ -735,8 +735,8 @@ void rtw_free_assoc_resources(struct adapter *adapter)
|
||||
void rtw_free_assoc_resources_locked(struct adapter *adapter)
|
||||
{
|
||||
struct wlan_network *pwlan = NULL;
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
struct sta_priv *pstapriv = &adapter->stapriv;
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
struct sta_priv *pstapriv = &adapter->stapriv;
|
||||
struct wlan_network *tgt_network = &pmlmepriv->cur_network;
|
||||
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_free_assoc_resources\n"));
|
||||
@ -784,7 +784,7 @@ void rtw_free_assoc_resources_locked(struct adapter *adapter)
|
||||
*/
|
||||
void rtw_indicate_connect(struct adapter *padapter)
|
||||
{
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+%s\n", __func__));
|
||||
|
||||
@ -810,7 +810,7 @@ void rtw_indicate_connect(struct adapter *padapter)
|
||||
*/
|
||||
void rtw_indicate_disconnect(struct adapter *padapter)
|
||||
{
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("+%s\n", __func__));
|
||||
|
||||
@ -965,12 +965,12 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net
|
||||
void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
|
||||
{
|
||||
struct sta_info *ptarget_sta = NULL, *pcur_sta = NULL;
|
||||
struct sta_priv *pstapriv = &adapter->stapriv;
|
||||
struct sta_priv *pstapriv = &adapter->stapriv;
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
struct wlan_network *pnetwork = (struct wlan_network *)pbuf;
|
||||
struct wlan_network *pnetwork = (struct wlan_network *)pbuf;
|
||||
struct wlan_network *cur_network = &pmlmepriv->cur_network;
|
||||
struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL;
|
||||
unsigned int the_same_macaddr = false;
|
||||
struct wlan_network *pcur_wlan = NULL, *ptarget_wlan = NULL;
|
||||
unsigned int the_same_macaddr = false;
|
||||
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("joinbss event call back received with res=%d\n", pnetwork->join_res));
|
||||
|
||||
@ -1087,7 +1087,7 @@ ignore_joinbss_callback:
|
||||
|
||||
void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf)
|
||||
{
|
||||
struct wlan_network *pnetwork = (struct wlan_network *)pbuf;
|
||||
struct wlan_network *pnetwork = (struct wlan_network *)pbuf;
|
||||
|
||||
mlmeext_joinbss_event_callback(adapter, pnetwork->join_res);
|
||||
|
||||
@ -1142,9 +1142,9 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
|
||||
{
|
||||
struct sta_info *psta;
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
struct stassoc_event *pstassoc = (struct stassoc_event *)pbuf;
|
||||
struct stassoc_event *pstassoc = (struct stassoc_event *)pbuf;
|
||||
struct wlan_network *cur_network = &pmlmepriv->cur_network;
|
||||
struct wlan_network *ptarget_wlan = NULL;
|
||||
struct wlan_network *ptarget_wlan = NULL;
|
||||
|
||||
if (!rtw_access_ctrl(adapter, pstassoc->macaddr))
|
||||
return;
|
||||
@ -1209,8 +1209,8 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
|
||||
struct wlan_bssid_ex *pdev_network = NULL;
|
||||
u8 *pibss = NULL;
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
struct stadel_event *pstadel = (struct stadel_event *)pbuf;
|
||||
struct sta_priv *pstapriv = &adapter->stapriv;
|
||||
struct stadel_event *pstadel = (struct stadel_event *)pbuf;
|
||||
struct sta_priv *pstapriv = &adapter->stapriv;
|
||||
struct wlan_network *tgt_network = &pmlmepriv->cur_network;
|
||||
|
||||
psta = rtw_get_stainfo(&adapter->stapriv, pstadel->macaddr);
|
||||
@ -1309,9 +1309,8 @@ void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf)
|
||||
*/
|
||||
void _rtw_join_timeout_handler (struct timer_list *t)
|
||||
{
|
||||
struct adapter *adapter =
|
||||
from_timer(adapter, t, mlmepriv.assoc_timer);
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
struct adapter *adapter = from_timer(adapter, t, mlmepriv.assoc_timer);
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
int do_join_r;
|
||||
|
||||
DBG_88E("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv));
|
||||
@ -1351,9 +1350,9 @@ void _rtw_join_timeout_handler (struct timer_list *t)
|
||||
*/
|
||||
void rtw_scan_timeout_handler (struct timer_list *t)
|
||||
{
|
||||
struct adapter *adapter =
|
||||
from_timer(adapter, t, mlmepriv.scan_to_timer);
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
struct adapter *adapter = from_timer(adapter, t,
|
||||
mlmepriv.scan_to_timer);
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
|
||||
DBG_88E(FUNC_ADPT_FMT" fw_state=%x\n", FUNC_ADPT_ARG(adapter), get_fwstate(pmlmepriv));
|
||||
spin_lock_bh(&pmlmepriv->lock);
|
||||
@ -1379,8 +1378,8 @@ static void rtw_auto_scan_handler(struct adapter *padapter)
|
||||
|
||||
void rtw_dynamic_check_timer_handlder(struct timer_list *t)
|
||||
{
|
||||
struct adapter *adapter =
|
||||
from_timer(adapter, t, mlmepriv.dynamic_chk_timer);
|
||||
struct adapter *adapter = from_timer(adapter, t,
|
||||
mlmepriv.dynamic_chk_timer);
|
||||
struct registry_priv *pregistrypriv = &adapter->registrypriv;
|
||||
|
||||
if (!adapter)
|
||||
@ -1414,7 +1413,8 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
|
||||
{
|
||||
int updated = false;
|
||||
unsigned long since_scan;
|
||||
struct adapter *adapter = container_of(pmlmepriv, struct adapter, mlmepriv);
|
||||
struct adapter *adapter = container_of(pmlmepriv, struct adapter,
|
||||
mlmepriv);
|
||||
|
||||
/* check bssid, if needed */
|
||||
if (pmlmepriv->assoc_by_bssid) {
|
||||
@ -1470,9 +1470,9 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)
|
||||
struct list_head *phead;
|
||||
struct adapter *adapter;
|
||||
struct __queue *queue = &pmlmepriv->scanned_queue;
|
||||
struct wlan_network *pnetwork = NULL;
|
||||
struct wlan_network *candidate = NULL;
|
||||
u8 supp_ant_div = false;
|
||||
struct wlan_network *pnetwork = NULL;
|
||||
struct wlan_network *candidate = NULL;
|
||||
u8 supp_ant_div = false;
|
||||
|
||||
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
|
||||
phead = get_list_head(queue);
|
||||
@ -1527,10 +1527,10 @@ exit:
|
||||
|
||||
int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv)
|
||||
{
|
||||
struct cmd_obj *pcmd;
|
||||
struct setauth_parm *psetauthparm;
|
||||
struct cmd_obj *pcmd;
|
||||
struct setauth_parm *psetauthparm;
|
||||
struct cmd_priv *pcmdpriv = &adapter->cmdpriv;
|
||||
int res = _SUCCESS;
|
||||
int res = _SUCCESS;
|
||||
|
||||
pcmd = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
|
||||
if (!pcmd) {
|
||||
@ -1561,12 +1561,12 @@ exit:
|
||||
|
||||
int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, int keyid, u8 set_tx)
|
||||
{
|
||||
u8 keylen;
|
||||
struct cmd_obj *pcmd;
|
||||
struct setkey_parm *psetkeyparm;
|
||||
u8 keylen;
|
||||
struct cmd_obj *pcmd;
|
||||
struct setkey_parm *psetkeyparm;
|
||||
struct cmd_priv *pcmdpriv = &adapter->cmdpriv;
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
int res = _SUCCESS;
|
||||
int res = _SUCCESS;
|
||||
|
||||
pcmd = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
|
||||
if (!pcmd)
|
||||
@ -1646,7 +1646,7 @@ err_free_cmd:
|
||||
/* 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)
|
||||
{
|
||||
unsigned int ielength = 0;
|
||||
unsigned int ielength = 0;
|
||||
unsigned int i, j;
|
||||
|
||||
/* i = 12; after the fixed IE */
|
||||
@ -1725,12 +1725,11 @@ static int rtw_append_pmkid(struct adapter *Adapter, int iEntry, u8 *ie, uint ie
|
||||
int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len)
|
||||
{
|
||||
u8 authmode;
|
||||
uint ielength;
|
||||
uint ielength;
|
||||
int iEntry;
|
||||
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
struct security_priv *psecuritypriv = &adapter->securitypriv;
|
||||
uint ndisauthmode = psecuritypriv->ndisauthtype;
|
||||
uint ndisauthmode = psecuritypriv->ndisauthtype;
|
||||
uint ndissecuritytype = psecuritypriv->ndisencryptstatus;
|
||||
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,
|
||||
@ -1772,7 +1771,7 @@ void rtw_init_registrypriv_dev_network(struct adapter *adapter)
|
||||
{
|
||||
struct registry_priv *pregistrypriv = &adapter->registrypriv;
|
||||
struct eeprom_priv *peepriv = &adapter->eeprompriv;
|
||||
struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;
|
||||
struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;
|
||||
u8 *myhwaddr = myid(peepriv);
|
||||
|
||||
memcpy(pdev_network->MacAddress, myhwaddr, ETH_ALEN);
|
||||
@ -1791,9 +1790,9 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
|
||||
{
|
||||
int sz = 0;
|
||||
struct registry_priv *pregistrypriv = &adapter->registrypriv;
|
||||
struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;
|
||||
struct security_priv *psecuritypriv = &adapter->securitypriv;
|
||||
struct wlan_network *cur_network = &adapter->mlmepriv.cur_network;
|
||||
struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;
|
||||
struct security_priv *psecuritypriv = &adapter->securitypriv;
|
||||
struct wlan_network *cur_network = &adapter->mlmepriv.cur_network;
|
||||
|
||||
pdev_network->Privacy = psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0; /* adhoc no 802.1x */
|
||||
|
||||
@ -1843,9 +1842,9 @@ void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter)
|
||||
/* the function is at passive_level */
|
||||
void rtw_joinbss_reset(struct adapter *padapter)
|
||||
{
|
||||
u8 threshold;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
u8 threshold;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
|
||||
/* todo: if you want to do something io/reg/hw setting before join_bss, please add code here */
|
||||
pmlmepriv->num_FortyMHzIntolerant = 0;
|
||||
@ -1875,9 +1874,9 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
|
||||
enum ht_cap_ampdu_factor max_rx_ampdu_factor;
|
||||
unsigned char *p;
|
||||
unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01, 0x00};
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct qos_priv *pqospriv = &pmlmepriv->qospriv;
|
||||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct qos_priv *pqospriv = &pmlmepriv->qospriv;
|
||||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
u32 rx_packet_offset, max_recvbuf_sz;
|
||||
|
||||
phtpriv->ht_option = false;
|
||||
@ -1939,10 +1938,10 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
|
||||
/* the function is > passive_level (in critical_section) */
|
||||
void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len)
|
||||
{
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
struct registry_priv *pregistrypriv = &padapter->registrypriv;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
|
||||
if (!phtpriv->ht_option)
|
||||
@ -2001,7 +2000,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
|
||||
u8 issued;
|
||||
int priority;
|
||||
struct sta_info *psta = NULL;
|
||||
struct ht_priv *phtpriv;
|
||||
struct ht_priv *phtpriv;
|
||||
struct pkt_attrib *pattrib = &pxmitframe->attrib;
|
||||
|
||||
if (is_multicast_ether_addr(pattrib->ra) ||
|
||||
@ -2034,7 +2033,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
|
||||
|
||||
void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)
|
||||
{
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
|
||||
spin_lock_bh(&pmlmepriv->lock);
|
||||
_rtw_roaming(padapter, tgt_network);
|
||||
@ -2043,9 +2042,8 @@ void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)
|
||||
|
||||
void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)
|
||||
{
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
int do_join_r;
|
||||
|
||||
struct wlan_network *pnetwork;
|
||||
|
||||
if (tgt_network)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user