drivers: staging: rtl8723au: Fix 'code indent should use tabs where possible' errors
Fix checkpatch.pl 'code indent should use tabs where possible' errors Signed-off-by: Greg Donald <gdonald@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
91b3aaf991
commit
a82b4b018a
10 changed files with 35 additions and 39 deletions
|
@ -717,11 +717,11 @@ int rtw_setstakey_cmd23a(struct rtw_adapter *padapter, u8 *psta, u8 unicast_key)
|
||||||
|
|
||||||
if (unicast_key == true) {
|
if (unicast_key == true) {
|
||||||
memcpy(&psetstakey_para->key, &sta->dot118021x_UncstKey, 16);
|
memcpy(&psetstakey_para->key, &sta->dot118021x_UncstKey, 16);
|
||||||
} else {
|
} else {
|
||||||
int idx = psecuritypriv->dot118021XGrpKeyid;
|
int idx = psecuritypriv->dot118021XGrpKeyid;
|
||||||
memcpy(&psetstakey_para->key,
|
memcpy(&psetstakey_para->key,
|
||||||
&psecuritypriv->dot118021XGrpKey[idx].skey, 16);
|
&psecuritypriv->dot118021XGrpKey[idx].skey, 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* jeff: set this because at least sw key is ready */
|
/* jeff: set this because at least sw key is ready */
|
||||||
padapter->securitypriv.busetkipkey = 1;
|
padapter->securitypriv.busetkipkey = 1;
|
||||||
|
|
|
@ -1842,7 +1842,7 @@ LedControl871x23a(struct rtw_adapter *padapter, enum led_ctl_mode LedAction) {
|
||||||
if ((padapter->bSurpriseRemoved == true) ||
|
if ((padapter->bSurpriseRemoved == true) ||
|
||||||
(padapter->bDriverStopped == true) ||
|
(padapter->bDriverStopped == true) ||
|
||||||
(padapter->hw_init_completed == false)) {
|
(padapter->hw_init_completed == false)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ledpriv->bRegUseLed == false)
|
if (ledpriv->bRegUseLed == false)
|
||||||
|
|
|
@ -159,7 +159,7 @@ rtw_find_network23a(struct rtw_queue *scanned_queue, u8 *addr)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
plist = plist->next;
|
plist = plist->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (plist == phead)
|
if (plist == phead)
|
||||||
pnetwork = NULL;
|
pnetwork = NULL;
|
||||||
|
@ -556,7 +556,7 @@ static int rtw_is_desired_network(struct rtw_adapter *adapter,
|
||||||
/* for correct flow of 8021X to do.... */
|
/* for correct flow of 8021X to do.... */
|
||||||
if (desired_encmode == Ndis802_11EncryptionDisabled &&
|
if (desired_encmode == Ndis802_11EncryptionDisabled &&
|
||||||
privacy != 0)
|
privacy != 0)
|
||||||
bselected = false;
|
bselected = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (desired_encmode != Ndis802_11EncryptionDisabled && privacy == 0) {
|
if (desired_encmode != Ndis802_11EncryptionDisabled && privacy == 0) {
|
||||||
|
@ -637,7 +637,7 @@ void rtw_survey_event_cb23a(struct rtw_adapter *adapter, const u8 *pbuf)
|
||||||
|
|
||||||
/* lock pmlmepriv->lock when you accessing network_q */
|
/* lock pmlmepriv->lock when you accessing network_q */
|
||||||
if (!check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) {
|
if (!check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) {
|
||||||
if (pnetwork->Ssid.ssid[0] == 0)
|
if (pnetwork->Ssid.ssid[0] == 0)
|
||||||
pnetwork->Ssid.ssid_len = 0;
|
pnetwork->Ssid.ssid_len = 0;
|
||||||
|
|
||||||
rtw_add_network(adapter, pnetwork);
|
rtw_add_network(adapter, pnetwork);
|
||||||
|
@ -743,7 +743,7 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv)
|
||||||
pnetwork = container_of(plist, struct wlan_network, list);
|
pnetwork = container_of(plist, struct wlan_network, list);
|
||||||
pnetwork->fixed = false;
|
pnetwork->fixed = false;
|
||||||
_rtw_free_network23a(pmlmepriv, pnetwork);
|
_rtw_free_network23a(pmlmepriv, pnetwork);
|
||||||
}
|
}
|
||||||
|
|
||||||
spin_unlock_bh(&scan_queue->lock);
|
spin_unlock_bh(&scan_queue->lock);
|
||||||
}
|
}
|
||||||
|
@ -855,7 +855,7 @@ void rtw_indicate_disconnect23a(struct rtw_adapter *padapter)
|
||||||
|
|
||||||
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING|WIFI_UNDER_WPS);
|
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING|WIFI_UNDER_WPS);
|
||||||
|
|
||||||
/* DBG_8723A("clear wps when %s\n", __func__); */
|
/* DBG_8723A("clear wps when %s\n", __func__); */
|
||||||
|
|
||||||
if (padapter->mlmepriv.to_roaming > 0)
|
if (padapter->mlmepriv.to_roaming > 0)
|
||||||
_clr_fwstate_(pmlmepriv, _FW_LINKED);
|
_clr_fwstate_(pmlmepriv, _FW_LINKED);
|
||||||
|
@ -1351,7 +1351,7 @@ void rtw_stadel_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf)
|
||||||
DBG_8723A("%s(mac_id=%d)=" MAC_FMT "\n", __func__, mac_id,
|
DBG_8723A("%s(mac_id=%d)=" MAC_FMT "\n", __func__, mac_id,
|
||||||
MAC_ARG(pstadel->macaddr));
|
MAC_ARG(pstadel->macaddr));
|
||||||
|
|
||||||
if (check_fwstate(pmlmepriv, WIFI_AP_STATE))
|
if (check_fwstate(pmlmepriv, WIFI_AP_STATE))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
mlmeext_sta_del_event_callback23a(adapter);
|
mlmeext_sta_del_event_callback23a(adapter);
|
||||||
|
|
|
@ -625,7 +625,7 @@ _mgt_dispatcher23a(struct rtw_adapter *padapter, struct mlme_handler *ptable,
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ptable->func(padapter, precv_frame);
|
ptable->func(padapter, precv_frame);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void mgt_dispatcher23a(struct rtw_adapter *padapter,
|
void mgt_dispatcher23a(struct rtw_adapter *padapter,
|
||||||
|
@ -1949,7 +1949,7 @@ OnDisassoc23a(struct rtw_adapter *padapter, struct recv_frame *precv_frame)
|
||||||
|
|
||||||
reason = le16_to_cpu(mgmt->u.disassoc.reason_code);
|
reason = le16_to_cpu(mgmt->u.disassoc.reason_code);
|
||||||
|
|
||||||
DBG_8723A("%s Reason code(%d)\n", __func__, reason);
|
DBG_8723A("%s Reason code(%d)\n", __func__, reason);
|
||||||
|
|
||||||
#ifdef CONFIG_8723AU_AP_MODE
|
#ifdef CONFIG_8723AU_AP_MODE
|
||||||
if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
|
if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
|
||||||
|
@ -5564,7 +5564,7 @@ int join_cmd_hdl23a(struct rtw_adapter *padapter, const u8 *pbuf)
|
||||||
struct ieee80211_ht_operation *pht_info;
|
struct ieee80211_ht_operation *pht_info;
|
||||||
u32 i;
|
u32 i;
|
||||||
u8 *p;
|
u8 *p;
|
||||||
/* u32 initialgain; */
|
/* u32 initialgain; */
|
||||||
/* u32 acparm; */
|
/* u32 acparm; */
|
||||||
|
|
||||||
/* check already connecting to AP or not */
|
/* check already connecting to AP or not */
|
||||||
|
|
|
@ -577,7 +577,7 @@ static struct recv_frame *portctrl(struct rtw_adapter *adapter,
|
||||||
("########portctrl:psta->ieee8021x_blocked =="
|
("########portctrl:psta->ieee8021x_blocked =="
|
||||||
"1\n"));
|
"1\n"));
|
||||||
|
|
||||||
if (ether_type == eapol_type) {
|
if (ether_type == eapol_type) {
|
||||||
prtnframe = precv_frame;
|
prtnframe = precv_frame;
|
||||||
} else {
|
} else {
|
||||||
/* free this frame */
|
/* free this frame */
|
||||||
|
@ -1170,7 +1170,7 @@ static int validate_recv_ctrl_frame(struct rtw_adapter *padapter,
|
||||||
|
|
||||||
if (psta->sleepq_len>0)
|
if (psta->sleepq_len>0)
|
||||||
pxmitframe->attrib.mdata = 1;
|
pxmitframe->attrib.mdata = 1;
|
||||||
else
|
else
|
||||||
pxmitframe->attrib.mdata = 0;
|
pxmitframe->attrib.mdata = 0;
|
||||||
|
|
||||||
pxmitframe->attrib.triggered = 1;
|
pxmitframe->attrib.triggered = 1;
|
||||||
|
@ -1891,7 +1891,7 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int enqueue_reorder_recvframe23a(struct recv_reorder_ctrl *preorder_ctrl,
|
static int enqueue_reorder_recvframe23a(struct recv_reorder_ctrl *preorder_ctrl,
|
||||||
struct recv_frame *prframe)
|
struct recv_frame *prframe)
|
||||||
{
|
{
|
||||||
struct rx_pkt_attrib *pattrib = &prframe->attrib;
|
struct rx_pkt_attrib *pattrib = &prframe->attrib;
|
||||||
struct rtw_queue *ppending_recvframe_queue;
|
struct rtw_queue *ppending_recvframe_queue;
|
||||||
|
@ -1975,7 +1975,7 @@ int recv_indicatepkts_in_order(struct rtw_adapter *padapter,
|
||||||
}
|
}
|
||||||
|
|
||||||
prframe = container_of(plist, struct recv_frame, list);
|
prframe = container_of(plist, struct recv_frame, list);
|
||||||
pattrib = &prframe->attrib;
|
pattrib = &prframe->attrib;
|
||||||
preorder_ctrl->indicate_seq = pattrib->seq_num;
|
preorder_ctrl->indicate_seq = pattrib->seq_num;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2125,7 +2125,7 @@ int recv_indicatepkt_reorder(struct rtw_adapter *padapter,
|
||||||
|
|
||||||
_err_exit:
|
_err_exit:
|
||||||
|
|
||||||
spin_unlock_bh(&ppending_recvframe_queue->lock);
|
spin_unlock_bh(&ppending_recvframe_queue->lock);
|
||||||
return _FAIL;
|
return _FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -702,7 +702,7 @@ int rtw_tkip_encrypt23a(struct rtw_adapter *padapter,
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_encrypt23a: stainfo == NULL!!!\n"));
|
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_encrypt23a: stainfo == NULL!!!\n"));
|
||||||
DBG_8723A("%s, psta == NUL\n", __func__);
|
DBG_8723A("%s, psta == NUL\n", __func__);
|
||||||
res = _FAIL;
|
res = _FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1071,12 +1071,8 @@ static void construct_mic_header1(u8 *mic_header1, int header_length, u8 *mpdu)
|
||||||
/* Builds the last MIC header block from */
|
/* Builds the last MIC header block from */
|
||||||
/* header fields. */
|
/* header fields. */
|
||||||
/************************************************/
|
/************************************************/
|
||||||
static void construct_mic_header2(
|
static void construct_mic_header2(u8 *mic_header2, u8 *mpdu, int a4_exists,
|
||||||
u8 *mic_header2,
|
int qc_exists)
|
||||||
u8 *mpdu,
|
|
||||||
int a4_exists,
|
|
||||||
int qc_exists
|
|
||||||
)
|
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
|
|
@ -352,7 +352,7 @@ static void set_bwmode(struct rtw_adapter *padapter, unsigned short bwmode,
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_channel_bwmode23a(struct rtw_adapter *padapter, unsigned char channel,
|
void set_channel_bwmode23a(struct rtw_adapter *padapter, unsigned char channel,
|
||||||
unsigned char channel_offset, unsigned short bwmode)
|
unsigned char channel_offset, unsigned short bwmode)
|
||||||
{
|
{
|
||||||
u8 center_ch;
|
u8 center_ch;
|
||||||
|
|
||||||
|
|
|
@ -254,14 +254,14 @@ static void update_attrib_vcs_info(struct rtw_adapter *padapter, struct xmit_fra
|
||||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||||
|
|
||||||
if (pattrib->psta) {
|
if (pattrib->psta) {
|
||||||
psta = pattrib->psta;
|
psta = pattrib->psta;
|
||||||
} else {
|
} else {
|
||||||
DBG_8723A("%s, call rtw_get_stainfo23a()\n", __func__);
|
DBG_8723A("%s, call rtw_get_stainfo23a()\n", __func__);
|
||||||
psta = rtw_get_stainfo23a(&padapter->stapriv, &pattrib->ra[0]);
|
psta = rtw_get_stainfo23a(&padapter->stapriv, &pattrib->ra[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (psta == NULL) {
|
if (psta == NULL) {
|
||||||
DBG_8723A("%s, psta == NUL\n", __func__);
|
DBG_8723A("%s, psta == NUL\n", __func__);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -159,10 +159,10 @@ enum NETWORK_TYPE
|
||||||
#define P80211_OUI_LEN 3
|
#define P80211_OUI_LEN 3
|
||||||
|
|
||||||
struct ieee80211_snap_hdr {
|
struct ieee80211_snap_hdr {
|
||||||
u8 dsap; /* always 0xAA */
|
u8 dsap; /* always 0xAA */
|
||||||
u8 ssap; /* always 0xAA */
|
u8 ssap; /* always 0xAA */
|
||||||
u8 ctrl; /* always 0x03 */
|
u8 ctrl; /* always 0x03 */
|
||||||
u8 oui[P80211_OUI_LEN]; /* organizational universal id */
|
u8 oui[P80211_OUI_LEN]; /* organizational universal id */
|
||||||
} __attribute__ ((packed));
|
} __attribute__ ((packed));
|
||||||
|
|
||||||
|
|
||||||
|
@ -221,8 +221,8 @@ struct ieee80211_snap_hdr {
|
||||||
#define IEEE80211_CCK_BASIC_RATES_MASK (IEEE80211_CCK_RATE_1MB_MASK | \
|
#define IEEE80211_CCK_BASIC_RATES_MASK (IEEE80211_CCK_RATE_1MB_MASK | \
|
||||||
IEEE80211_CCK_RATE_2MB_MASK)
|
IEEE80211_CCK_RATE_2MB_MASK)
|
||||||
#define IEEE80211_CCK_DEFAULT_RATES_MASK (IEEE80211_CCK_BASIC_RATES_MASK | \
|
#define IEEE80211_CCK_DEFAULT_RATES_MASK (IEEE80211_CCK_BASIC_RATES_MASK | \
|
||||||
IEEE80211_CCK_RATE_5MB_MASK | \
|
IEEE80211_CCK_RATE_5MB_MASK | \
|
||||||
IEEE80211_CCK_RATE_11MB_MASK)
|
IEEE80211_CCK_RATE_11MB_MASK)
|
||||||
|
|
||||||
#define IEEE80211_OFDM_RATES_MASK 0x00000FF0
|
#define IEEE80211_OFDM_RATES_MASK 0x00000FF0
|
||||||
#define IEEE80211_OFDM_BASIC_RATES_MASK (IEEE80211_OFDM_RATE_6MB_MASK | \
|
#define IEEE80211_OFDM_BASIC_RATES_MASK (IEEE80211_OFDM_RATE_6MB_MASK | \
|
||||||
|
@ -235,7 +235,7 @@ struct ieee80211_snap_hdr {
|
||||||
IEEE80211_OFDM_RATE_48MB_MASK | \
|
IEEE80211_OFDM_RATE_48MB_MASK | \
|
||||||
IEEE80211_OFDM_RATE_54MB_MASK)
|
IEEE80211_OFDM_RATE_54MB_MASK)
|
||||||
#define IEEE80211_DEFAULT_RATES_MASK (IEEE80211_OFDM_DEFAULT_RATES_MASK | \
|
#define IEEE80211_DEFAULT_RATES_MASK (IEEE80211_OFDM_DEFAULT_RATES_MASK | \
|
||||||
IEEE80211_CCK_DEFAULT_RATES_MASK)
|
IEEE80211_CCK_DEFAULT_RATES_MASK)
|
||||||
|
|
||||||
#define IEEE80211_NUM_OFDM_RATES 8
|
#define IEEE80211_NUM_OFDM_RATES 8
|
||||||
#define IEEE80211_NUM_CCK_RATES 4
|
#define IEEE80211_NUM_CCK_RATES 4
|
||||||
|
|
|
@ -547,14 +547,14 @@ struct setratable_parm {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct getratable_parm {
|
struct getratable_parm {
|
||||||
uint rsvd;
|
uint rsvd;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct getratable_rsp {
|
struct getratable_rsp {
|
||||||
u8 ss_ForceUp[NumRates];
|
u8 ss_ForceUp[NumRates];
|
||||||
u8 ss_ULevel[NumRates];
|
u8 ss_ULevel[NumRates];
|
||||||
u8 ss_DLevel[NumRates];
|
u8 ss_DLevel[NumRates];
|
||||||
u8 count_judge[NumRates];
|
u8 count_judge[NumRates];
|
||||||
};
|
};
|
||||||
|
|
||||||
/* to get TX,RX retry count */
|
/* to get TX,RX retry count */
|
||||||
|
|
Loading…
Add table
Reference in a new issue