mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-10 23:20:05 +00:00
staging: rtl8188eu: add spaces around '&' in rtw_mlme_ext.c
Add spaces around '&' to follow kernel coding style. Reported by checkpatch. 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
e54a823e90
commit
241e15dbfc
@ -355,7 +355,7 @@ static void issue_beacon(struct adapter *padapter, int timeout_ms)
|
||||
pframe += sizeof(struct ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);
|
||||
|
||||
if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) {
|
||||
if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) {
|
||||
int len_diff;
|
||||
u8 *wps_ie;
|
||||
uint wps_ielen;
|
||||
@ -503,7 +503,7 @@ static void issue_probersp(struct adapter *padapter, unsigned char *da)
|
||||
return;
|
||||
|
||||
#if defined(CONFIG_88EU_AP_MODE)
|
||||
if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) {
|
||||
if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) {
|
||||
pwps_ie = rtw_get_wps_ie(cur_network->ies+_FIXED_IE_LENGTH_, cur_network->ie_length-_FIXED_IE_LENGTH_, NULL, &wps_ielen);
|
||||
|
||||
/* inerset & update wps_probe_resp_ie */
|
||||
@ -571,7 +571,7 @@ static void issue_probersp(struct adapter *padapter, unsigned char *da)
|
||||
/* DS parameter set */
|
||||
pframe = rtw_set_ie(pframe, _DSSET_IE_, 1, (unsigned char *)&cur_network->Configuration.DSConfig, &pattrib->pktlen);
|
||||
|
||||
if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) {
|
||||
if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) {
|
||||
u8 erpinfo = 0;
|
||||
u32 ATIMWindow;
|
||||
/* IBSS Parameter Set... */
|
||||
@ -1218,9 +1218,9 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da,
|
||||
fctrl = &pwlanhdr->frame_control;
|
||||
*(fctrl) = 0;
|
||||
|
||||
if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
|
||||
if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE)
|
||||
SetFrDs(fctrl);
|
||||
else if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE)
|
||||
else if ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE)
|
||||
SetToDs(fctrl);
|
||||
|
||||
if (power_mode)
|
||||
@ -1339,9 +1339,9 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da,
|
||||
fctrl = &pwlanhdr->frame_control;
|
||||
*(fctrl) = 0;
|
||||
|
||||
if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
|
||||
if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE)
|
||||
SetFrDs(fctrl);
|
||||
else if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE)
|
||||
else if ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE)
|
||||
SetToDs(fctrl);
|
||||
|
||||
if (pattrib->mdata)
|
||||
@ -1612,7 +1612,7 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,
|
||||
|
||||
psta = rtw_get_stainfo(pstapriv, raddr);
|
||||
if (psta) {
|
||||
start_seq = (psta->sta_xmitpriv.txseq_tid[status & 0x07]&0xfff) + 1;
|
||||
start_seq = (psta->sta_xmitpriv.txseq_tid[status & 0x07] & 0xfff) + 1;
|
||||
|
||||
DBG_88E("BA_starting_seqctrl=%d for TID=%d\n", start_seq, status & 0x07);
|
||||
|
||||
@ -1828,7 +1828,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
u16 tid;
|
||||
|
||||
if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
|
||||
if ((pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE)
|
||||
if (!(pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS))
|
||||
return _SUCCESS;
|
||||
|
||||
@ -1840,7 +1840,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)
|
||||
for (tid = 0; tid < MAXTID; tid++) {
|
||||
if (psta->recvreorder_ctrl[tid].enable) {
|
||||
DBG_88E("rx agg disable tid(%d)\n", tid);
|
||||
issue_action_BA(padapter, addr, RTW_WLAN_ACTION_DELBA, (((tid << 1) | initiator)&0x1F));
|
||||
issue_action_BA(padapter, addr, RTW_WLAN_ACTION_DELBA, (((tid << 1) | initiator) & 0x1F));
|
||||
psta->recvreorder_ctrl[tid].enable = false;
|
||||
psta->recvreorder_ctrl[tid].indicate_seq = 0xffff;
|
||||
}
|
||||
@ -1849,7 +1849,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)
|
||||
for (tid = 0; tid < MAXTID; tid++) {
|
||||
if (psta->htpriv.agg_enable_bitmap & BIT(tid)) {
|
||||
DBG_88E("tx agg disable tid(%d)\n", tid);
|
||||
issue_action_BA(padapter, addr, RTW_WLAN_ACTION_DELBA, (((tid << 1) | initiator)&0x1F));
|
||||
issue_action_BA(padapter, addr, RTW_WLAN_ACTION_DELBA, (((tid << 1) | initiator) & 0x1F));
|
||||
psta->htpriv.agg_enable_bitmap &= ~BIT(tid);
|
||||
psta->htpriv.candidate_tid_bitmap &= ~BIT(tid);
|
||||
}
|
||||
@ -2194,7 +2194,7 @@ static void start_create_ibss(struct adapter *padapter)
|
||||
/* update capability */
|
||||
caps = rtw_get_capability((struct wlan_bssid_ex *)pnetwork);
|
||||
update_capinfo(padapter, caps);
|
||||
if (caps&cap_IBSS) {/* adhoc master */
|
||||
if (caps & cap_IBSS) {/* adhoc master */
|
||||
val8 = 0xcf;
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8));
|
||||
|
||||
@ -2246,7 +2246,7 @@ static void start_clnt_join(struct adapter *padapter)
|
||||
/* update capability */
|
||||
caps = rtw_get_capability((struct wlan_bssid_ex *)pnetwork);
|
||||
update_capinfo(padapter, caps);
|
||||
if (caps&cap_ESS) {
|
||||
if (caps & cap_ESS) {
|
||||
Set_MSR(padapter, WIFI_FW_STATION_STATE);
|
||||
|
||||
val8 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_8021X) ? 0xcc : 0xcf;
|
||||
@ -2264,7 +2264,7 @@ static void start_clnt_join(struct adapter *padapter)
|
||||
msecs_to_jiffies((REAUTH_TO * REAUTH_LIMIT) + (REASSOC_TO * REASSOC_LIMIT) + beacon_timeout));
|
||||
|
||||
pmlmeinfo->state = WIFI_FW_AUTH_NULL | WIFI_FW_STATION_STATE;
|
||||
} else if (caps&cap_IBSS) { /* adhoc client */
|
||||
} else if (caps & cap_IBSS) { /* adhoc client */
|
||||
Set_MSR(padapter, WIFI_FW_ADHOC_STATE);
|
||||
|
||||
val8 = 0xcf;
|
||||
@ -2341,7 +2341,7 @@ static unsigned int receive_disconnect(struct adapter *padapter,
|
||||
|
||||
DBG_88E("%s\n", __func__);
|
||||
|
||||
if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) {
|
||||
if ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE) {
|
||||
if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) {
|
||||
pmlmeinfo->state = WIFI_FW_NULL_STATE;
|
||||
report_del_sta_event(padapter, MacAddr, reason);
|
||||
@ -2594,7 +2594,7 @@ static unsigned int OnBeacon(struct adapter *padapter,
|
||||
return _SUCCESS;
|
||||
}
|
||||
|
||||
if (((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) && (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) {
|
||||
if (((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE) && (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) {
|
||||
psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
|
||||
if (psta != NULL) {
|
||||
ret = rtw_check_bcn_info(padapter, pframe, len);
|
||||
@ -2608,7 +2608,7 @@ static unsigned int OnBeacon(struct adapter *padapter,
|
||||
if ((sta_rx_pkts(psta) & 0xf) == 0)
|
||||
update_beacon_info(padapter, pframe, len, psta);
|
||||
}
|
||||
} else if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) {
|
||||
} else if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) {
|
||||
psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
|
||||
if (psta != NULL) {
|
||||
/* update WMM, ERP in the beacon */
|
||||
@ -2659,7 +2659,7 @@ static unsigned int OnAuth(struct adapter *padapter,
|
||||
u8 *pframe = precv_frame->pkt->data;
|
||||
uint len = precv_frame->pkt->len;
|
||||
|
||||
if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
|
||||
if ((pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE)
|
||||
return _FAIL;
|
||||
|
||||
DBG_88E("+%s\n", __func__);
|
||||
@ -2910,7 +2910,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
|
||||
u8 *pframe = precv_frame->pkt->data;
|
||||
uint ie_len, pkt_len = precv_frame->pkt->len;
|
||||
|
||||
if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
|
||||
if ((pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE)
|
||||
return _FAIL;
|
||||
|
||||
frame_type = GetFrameSubType(pframe);
|
||||
@ -3035,8 +3035,8 @@ static unsigned int OnAssocReq(struct adapter *padapter,
|
||||
pstat->dot8021xalg = 1;/* psk, todo:802.1x */
|
||||
pstat->wpa_psk |= BIT(1);
|
||||
|
||||
pstat->wpa2_group_cipher = group_cipher&psecuritypriv->wpa2_group_cipher;
|
||||
pstat->wpa2_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa2_pairwise_cipher;
|
||||
pstat->wpa2_group_cipher = group_cipher & psecuritypriv->wpa2_group_cipher;
|
||||
pstat->wpa2_pairwise_cipher = pairwise_cipher & psecuritypriv->wpa2_pairwise_cipher;
|
||||
|
||||
if (!pstat->wpa2_group_cipher)
|
||||
status = WLAN_STATUS_INVALID_GROUP_CIPHER;
|
||||
@ -3056,8 +3056,8 @@ static unsigned int OnAssocReq(struct adapter *padapter,
|
||||
pstat->dot8021xalg = 1;/* psk, todo:802.1x */
|
||||
pstat->wpa_psk |= BIT(0);
|
||||
|
||||
pstat->wpa_group_cipher = group_cipher&psecuritypriv->wpa_group_cipher;
|
||||
pstat->wpa_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa_pairwise_cipher;
|
||||
pstat->wpa_group_cipher = group_cipher & psecuritypriv->wpa_group_cipher;
|
||||
pstat->wpa_pairwise_cipher = pairwise_cipher & psecuritypriv->wpa_pairwise_cipher;
|
||||
|
||||
if (!pstat->wpa_group_cipher)
|
||||
status = WLAN_STATUS_INVALID_GROUP_CIPHER;
|
||||
@ -3153,30 +3153,30 @@ static unsigned int OnAssocReq(struct adapter *padapter,
|
||||
pstat->qos_option = 1;
|
||||
pstat->qos_info = *(p+8);
|
||||
|
||||
pstat->max_sp_len = (pstat->qos_info>>5)&0x3;
|
||||
pstat->max_sp_len = (pstat->qos_info>>5) & 0x3;
|
||||
|
||||
if ((pstat->qos_info&0xf) != 0xf)
|
||||
if ((pstat->qos_info & 0xf) != 0xf)
|
||||
pstat->has_legacy_ac = true;
|
||||
else
|
||||
pstat->has_legacy_ac = false;
|
||||
|
||||
if (pstat->qos_info&0xf) {
|
||||
if (pstat->qos_info&BIT(0))
|
||||
if (pstat->qos_info & 0xf) {
|
||||
if (pstat->qos_info & BIT(0))
|
||||
pstat->uapsd_vo = BIT(0)|BIT(1);
|
||||
else
|
||||
pstat->uapsd_vo = 0;
|
||||
|
||||
if (pstat->qos_info&BIT(1))
|
||||
if (pstat->qos_info & BIT(1))
|
||||
pstat->uapsd_vi = BIT(0)|BIT(1);
|
||||
else
|
||||
pstat->uapsd_vi = 0;
|
||||
|
||||
if (pstat->qos_info&BIT(2))
|
||||
if (pstat->qos_info & BIT(2))
|
||||
pstat->uapsd_bk = BIT(0)|BIT(1);
|
||||
else
|
||||
pstat->uapsd_bk = 0;
|
||||
|
||||
if (pstat->qos_info&BIT(3))
|
||||
if (pstat->qos_info & BIT(3))
|
||||
pstat->uapsd_be = BIT(0)|BIT(1);
|
||||
else
|
||||
pstat->uapsd_be = 0;
|
||||
@ -3203,14 +3203,14 @@ static unsigned int OnAssocReq(struct adapter *padapter,
|
||||
} else {
|
||||
pstat->flags &= ~WLAN_STA_HT;
|
||||
}
|
||||
if ((!pmlmepriv->htpriv.ht_option) && (pstat->flags&WLAN_STA_HT)) {
|
||||
if ((!pmlmepriv->htpriv.ht_option) && (pstat->flags & WLAN_STA_HT)) {
|
||||
status = _STATS_FAILURE_;
|
||||
goto OnAssocReqFail;
|
||||
}
|
||||
|
||||
if ((pstat->flags & WLAN_STA_HT) &&
|
||||
((pstat->wpa2_pairwise_cipher&WPA_CIPHER_TKIP) ||
|
||||
(pstat->wpa_pairwise_cipher&WPA_CIPHER_TKIP))) {
|
||||
((pstat->wpa2_pairwise_cipher & WPA_CIPHER_TKIP) ||
|
||||
(pstat->wpa_pairwise_cipher & WPA_CIPHER_TKIP))) {
|
||||
DBG_88E("HT: %pM tried to "
|
||||
"use TKIP with HT association\n", pstat->hwaddr);
|
||||
|
||||
@ -3365,7 +3365,7 @@ static unsigned int OnAssocRsp(struct adapter *padapter,
|
||||
pmlmeinfo->slotTime = (pmlmeinfo->capability & BIT(10)) ? 9 : 20;
|
||||
|
||||
/* AID */
|
||||
pmlmeinfo->aid = (int)(le16_to_cpu(*(__le16 *)(pframe + WLAN_HDR_A3_LEN + 4))&0x3fff);
|
||||
pmlmeinfo->aid = (int)(le16_to_cpu(*(__le16 *)(pframe + WLAN_HDR_A3_LEN + 4)) & 0x3fff);
|
||||
res = pmlmeinfo->aid;
|
||||
|
||||
/* following are moved to join event callback function */
|
||||
@ -3596,7 +3596,7 @@ static unsigned int OnAction_back(struct adapter *padapter,
|
||||
|
||||
DBG_88E("%s\n", __func__);
|
||||
|
||||
if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
|
||||
if ((pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE)
|
||||
if (!(pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS))
|
||||
return _SUCCESS;
|
||||
|
||||
@ -3661,7 +3661,7 @@ static s32 rtw_action_public_decache(struct recv_frame *recv_frame, s32 token)
|
||||
struct adapter *adapter = recv_frame->adapter;
|
||||
struct mlme_ext_priv *mlmeext = &adapter->mlmeextpriv;
|
||||
u8 *frame = recv_frame->pkt->data;
|
||||
u16 seq_ctrl = ((recv_frame->attrib.seq_num&0xffff) << 4) |
|
||||
u16 seq_ctrl = ((recv_frame->attrib.seq_num & 0xffff) << 4) |
|
||||
(recv_frame->attrib.frag_num & 0xf);
|
||||
|
||||
if (GetRetry(frame)) {
|
||||
@ -4474,7 +4474,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
|
||||
goto exit_mlmeext_joinbss_event_callback;
|
||||
}
|
||||
|
||||
if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) {
|
||||
if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) {
|
||||
/* for bc/mc */
|
||||
psta_bmc = rtw_get_bcmc_stainfo(padapter);
|
||||
if (psta_bmc) {
|
||||
@ -4522,7 +4522,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
|
||||
join_type = 2;
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type));
|
||||
|
||||
if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) {
|
||||
if ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE) {
|
||||
/* correcting TSF */
|
||||
correct_TSF(padapter, pmlmeext);
|
||||
}
|
||||
@ -4541,7 +4541,7 @@ void mlmeext_sta_add_event_callback(struct adapter *padapter, struct sta_info *p
|
||||
|
||||
DBG_88E("%s\n", __func__);
|
||||
|
||||
if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) {
|
||||
if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) {
|
||||
if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) {/* adhoc master or sta_count>1 */
|
||||
/* nothing to do */
|
||||
} else { /* adhoc client */
|
||||
@ -5048,7 +5048,7 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf)
|
||||
/* restore to initial setting. */
|
||||
update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode);
|
||||
|
||||
if (((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) || ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)) {
|
||||
if (((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) || ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE)) {
|
||||
/* Stop BCN */
|
||||
val8 = 0;
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_BCN_FUNC, (u8 *)(&val8));
|
||||
@ -5248,7 +5248,7 @@ u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf)
|
||||
|
||||
DBG_88E_LEVEL(_drv_info_, "set pairwise key to hw: alg:%d(WEP40-1 WEP104-5 TKIP-2 AES-4) camid:%d\n",
|
||||
pparm->algorithm, cam_id);
|
||||
if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) {
|
||||
if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) {
|
||||
struct sta_info *psta;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
|
||||
@ -5305,7 +5305,7 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf)
|
||||
return H2C_SUCCESS;
|
||||
|
||||
if (((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && (pmlmeinfo->HT_enable)) ||
|
||||
((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)) {
|
||||
((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE)) {
|
||||
issue_action_BA(padapter, pparm->addr, RTW_WLAN_ACTION_ADDBA_REQ, (u16)pparm->tid);
|
||||
mod_timer(&psta->addba_retry_timer,
|
||||
jiffies + msecs_to_jiffies(ADDBA_TO));
|
||||
@ -5360,8 +5360,8 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
|
||||
void (*event_callback)(struct adapter *dev, u8 *pbuf);
|
||||
|
||||
peventbuf = (uint *)pbuf;
|
||||
evt_sz = (u16)(*peventbuf&0xffff);
|
||||
evt_code = (u8)((*peventbuf>>16)&0xff);
|
||||
evt_sz = (u16)(*peventbuf & 0xffff);
|
||||
evt_code = (u8)((*peventbuf>>16) & 0xff);
|
||||
|
||||
/* checking if event code is valid */
|
||||
if (evt_code >= MAX_C2HEVT) {
|
||||
@ -5407,7 +5407,7 @@ u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf)
|
||||
if (!psta_bmc)
|
||||
return H2C_SUCCESS;
|
||||
|
||||
if ((pstapriv->tim_bitmap&BIT(0)) && (psta_bmc->sleepq_len > 0)) {
|
||||
if ((pstapriv->tim_bitmap & BIT(0)) && (psta_bmc->sleepq_len > 0)) {
|
||||
msleep(10);/* 10ms, ATIM(HIQ) Windows */
|
||||
spin_lock_bh(&psta_bmc->sleep_q.lock);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user