staging: rtl8188eu: cleanup declarations in rtw_mlme_ext.c
PATCH v2 1/17 staging: rtl8188eu: cleanup declarations in rtw_mlme_ext.c
Replace tabs with spaces and/or remove spaces in declarations.
---
v1 -> v2
one logical thing per patch
replace some more tabs with spaces
remove some more comments
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 482 +++++++++--------- 1 file changed, 241 insertions(+), 241 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +241 -241
@@ -22,14 +22,14 @@ static u8 null_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};/************************************************** OUI definitions for the vendor specific IE ***************************************************/ -unsigned char RTW_WPA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x01 }; +unsigned char RTW_WPA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x01 };unsigned char WMM_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 }; -unsigned char WPS_OUI [] = {0x00 ,0x50 ,0xf2 ,0x04 }; -unsigned char P2P_OUI [] = {0x50 ,0x6F ,0x9A ,0x09 }; -unsigned char WFD_OUI [] = {0x50 ,0x6F ,0x9A ,0x0A }; +unsigned char WPS_OUI [] = {0x00 ,0x50 ,0xf2 ,0x04 }; +unsigned char P2P_OUI [] = {0x50 ,0x6F ,0x9A ,0x09 }; +unsigned char WFD_OUI [] = {0x50 ,0x6F ,0x9A ,0x0A }; -unsigned char WMM_INFO_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x00 ,0x01 }; -unsigned char WMM_PARA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 }; +unsigned char WMM_INFO_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x00 ,0x01 }; +unsigned char WMM_PARA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 };unsigned char WPA_TKIP_CIPHER [4 ] = {0x00 ,0x50 ,0xf2 ,0x02 };unsigned char RSN_TKIP_CIPHER [4 ] = {0x00 ,0x0f ,0xac ,0x02 };
@@ -56,7 +56,7 @@ static struct rt_channel_plan_2g RTW_ChannelPlan2G[RT_CHANNEL_DOMAIN_2G_MAX] = { {{}, 0}, /* 0x05, RT_CHANNEL_DOMAIN_2G_NULL */ }; -static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX ] = { +static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX ] = {/* 0x00 ~ 0x1F , Old Define ===== */ {0x02 },/* 0x00, RT_CHANNEL_DOMAIN_FCC */ {0x02 },/* 0x01, RT_CHANNEL_DOMAIN_IC */
@@ -154,8 +154,8 @@ int rtw_ch_set_search_ch(struct rt_channel_info *ch_set, const u32 ch)struct xmit_frame *alloc_mgtxmitframe (struct xmit_priv *pxmitpriv) { -struct xmit_frame *pmgntframe; -struct xmit_buf *pxmitbuf; +struct xmit_frame *pmgntframe; +struct xmit_buf *pxmitbuf; pmgntframe =rtw_alloc_xmitframe (pxmitpriv);if (!pmgntframe) {
@@ -184,7 +184,7 @@ Following are some TX functions for WiFi MLMEvoid update_mgnt_tx_rate (struct adapter *padapter,u8 rate) { -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); pmlmeext->tx_rate = rate;DBG_88E ("%s(): rate = %x\n" , __func__, rate);
@@ -192,7 +192,7 @@ void update_mgnt_tx_rate(struct adapter *padapter, u8 rate)void update_mgntframe_attrib (struct adapter *padapter,struct pkt_attrib *pattrib) { -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);memset ((u8 *)(pattrib),0 ,sizeof (struct pkt_attrib ));
@@ -259,7 +259,7 @@ static s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, {s32 ret = _FAIL;u32 timeout_ms =500 ;/* 500ms */ -struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct xmit_priv *pxmitpriv = &padapter->xmitpriv;if (padapter->bSurpriseRemoved || padapter->bDriverStopped)return -1 ;
@@ -313,18 +313,18 @@ static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode)static void issue_beacon (struct adapter *padapter,int timeout_ms) { -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; -unsigned char *pframe; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib; +unsigned char *pframe;struct ieee80211_hdr *pwlanhdr;__le16 *fctrl; -unsigned int rate_len; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); +unsigned int rate_len; +struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); -u8 bc_addr[] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; +struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +u8 bc_addr[] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe) {
@@ -454,22 +454,22 @@ static void issue_beacon(struct adapter *padapter, int timeout_ms)static void issue_probersp (struct adapter *padapter,unsigned char *da) { -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; -unsigned char *pframe; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib; +unsigned char *pframe;struct ieee80211_hdr *pwlanhdr;__le16 *fctrl; -unsigned char *mac, *bssid; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); +unsigned char *mac, *bssid; +struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);#if defined(CONFIG_88EU_AP_MODE )u8 *pwps_ie;uint wps_ielen;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;#endif /* if defined (CONFIG_88EU_AP_MODE) */ -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); -unsigned int rate_len; +struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +unsigned int rate_len; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe) {
@@ -603,18 +603,18 @@ static int issue_probereq(struct adapter *padapter, bool wait_ack) {int ret = _FAIL; -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; -unsigned char *pframe; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib; +unsigned char *pframe;struct ieee80211_hdr *pwlanhdr;__le16 *fctrl; -unsigned char *mac; -unsigned char bssrate[NumRates]; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); +unsigned char *mac; +unsigned char bssrate[NumRates]; +struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -int bssrate_len =0 ; -u8 bc_addr[] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; +struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +int bssrate_len =0 ; +u8 bc_addr[] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff };RT_TRACE (_module_rtl871x_mlme_c_, _drv_notice_, ("+%s\n" , __func__));
@@ -750,9 +750,9 @@ static void issue_auth(struct adapter *padapter, struct sta_info *psta,#endif int use_shared_key =0 ;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (pmgntframe ==NULL )
@@ -883,16 +883,16 @@ static void issue_auth(struct adapter *padapter, struct sta_info *psta,static void issue_asocrsp (struct adapter *padapter,unsigned short status,struct sta_info *pstat,int pkt_type) { -struct xmit_frame *pmgntframe; +struct xmit_frame *pmgntframe;struct ieee80211_hdr *pwlanhdr;struct pkt_attrib *pattrib; -unsigned char *pbuf, *pframe; +unsigned char *pbuf, *pframe;unsigned short val;__le16 *fctrl;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);u8 *ie = pnetwork->ies;__le16 lestatus, leval;
@@ -1008,21 +1008,21 @@ static void issue_asocrsp(struct adapter *padapter, unsigned short status,static void issue_assocreq (struct adapter *padapter) {int ret = _FAIL; -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; -unsigned char *pframe, *p; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib; +unsigned char *pframe, *p;struct ieee80211_hdr *pwlanhdr;__le16 *fctrl; -unsigned int i, j, ie_len, index =0 ; +unsigned int i, j, ie_len, index =0 ;unsigned char bssrate[NumRates], sta_bssrate[NumRates];struct ndis_802_11_var_ie *pIE; -struct registry_priv *pregpriv = &padapter->registrypriv; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); +struct registry_priv *pregpriv = &padapter->registrypriv; +struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -int bssrate_len =0 , sta_bssrate_len =0 ; -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +int bssrate_len =0 , sta_bssrate_len =0 ; +struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe)
@@ -1187,15 +1187,15 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, bool wait_ack) { int ret = _FAIL; -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; -unsigned char *pframe; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib; +unsigned char *pframe;struct ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct xmit_priv *pxmitpriv; -struct mlme_ext_priv *pmlmeext; -struct mlme_ext_info *pmlmeinfo; -struct wlan_bssid_ex *pnetwork; +struct xmit_priv *pxmitpriv; +struct mlme_ext_priv *pmlmeext; +struct mlme_ext_info *pmlmeinfo; +struct wlan_bssid_ex *pnetwork;if (!padapter) goto exit;
@@ -1262,9 +1262,9 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da,int ret;int i =0 ;unsigned long start = jiffies; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);/* da == NULL, assume it's null data for sta to ap*/ if (da ==NULL )
@@ -1308,16 +1308,16 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, bool wait_ack) { int ret = _FAIL; -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; -unsigned char *pframe; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib; +unsigned char *pframe;struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned short *qc; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); +struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);DBG_88E ("%s\n" , __func__);
@@ -1391,9 +1391,9 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da,int ret;int i =0 ;unsigned long start = jiffies; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);/* da == NULL, assume it's null data for sta to ap*/ if (da ==NULL )
@@ -1435,15 +1435,15 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da,static int _issue_deauth (struct adapter *padapter,unsigned char *da,unsigned short reason,bool wait_ack) { -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; -unsigned char *pframe; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib; +unsigned char *pframe;struct ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); +struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);int ret = _FAIL;__le16 le_tmp;
@@ -1548,7 +1548,7 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,u16 BA_para_set;u16 reason_code;u16 BA_timeout_value; -__le16 le_tmp; +__le16 le_tmp;u16 BA_starting_seqctrl =0 ;enum ht_cap_ampdu_factor max_rx_ampdu_factor;struct xmit_frame *pmgntframe;
@@ -1562,7 +1562,7 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,struct sta_info *psta;struct sta_priv *pstapriv = &padapter->stapriv;struct registry_priv *pregpriv = &padapter->registrypriv; -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);DBG_88E ("%s, category=%d, action=%d, status=%d\n" , __func__, category, action, status);
@@ -1697,20 +1697,20 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) {struct list_head *plist, *phead;unsigned char category, action; -struct xmit_frame *pmgntframe; -struct pkt_attrib *pattrib; -unsigned char *pframe; +struct xmit_frame *pmgntframe; +struct pkt_attrib *pattrib; +unsigned char *pframe;struct ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct wlan_network *pnetwork =NULL ; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); +struct wlan_network *pnetwork =NULL ; +struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct __queue *queue = &(pmlmepriv->scanned_queue);u8 InfoContent[16 ] = {0 };u8 ICS [8 ][15 ]; -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);if ((pmlmepriv->num_FortyMHzIntolerant ==0 ) || (pmlmepriv->num_sta_no_ht ==0 ))return ;
@@ -1829,8 +1829,8 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)struct sta_priv *pstapriv = &padapter->stapriv;struct sta_info *psta =NULL ;/* struct recv_reorder_ctrl *preorder_ctrl; */ -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);u16 tid;if ((pmlmeinfo->state&0x03 ) !=WIFI_FW_AP_STATE )
@@ -1867,7 +1867,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)unsigned int send_beacon (struct adapter *padapter) {u8 bxmitok = false; -int issue =0 ; +int issue =0 ;int poll =0 ;unsigned long start = jiffies;
@@ -1908,10 +1908,10 @@ Following are some utility functions for WiFi MLMEstatic void site_survey (struct adapter *padapter) { -unsigned char survey_channel =0 , val8; +unsigned char survey_channel =0 , val8;enum rt_scan_type ScanType =SCAN_PASSIVE ; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);u32 initialgain =0 ;struct rtw_ieee80211_channel *ch;
@@ -2016,16 +2016,16 @@ static u8 collect_bss_info(struct adapter *padapter,struct recv_frame *precv_frame, struct wlan_bssid_ex *bssid) { - int i; -u32 len; + int i; +u32 len;u8 *p;u16 val16, subtype;u8 *pframe = precv_frame->pkt->data;u32 packet_len = precv_frame->pkt->len;u8 ie_offset; -struct registry_priv *pregistrypriv = &padapter->registrypriv; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct registry_priv *pregistrypriv = &padapter->registrypriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); len = packet_len -sizeof (struct ieee80211_hdr_3addr );
@@ -2184,11 +2184,11 @@ static u8 collect_bss_info(struct adapter *padapter,static void start_create_ibss (struct adapter *padapter) { -unsigned short caps; +unsigned short caps;u8 val8;u8 join_type; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network)); pmlmeext->cur_channel = (u8 )pnetwork->Configuration.DSConfig;
@@ -2236,10 +2236,10 @@ static void start_create_ibss(struct adapter *padapter)static void start_clnt_join (struct adapter *padapter) { -unsigned short caps; +unsigned short caps;u8 val8; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network));int beacon_timeout;
@@ -2291,8 +2291,8 @@ static void start_clnt_join(struct adapter *padapter)static void start_clnt_auth (struct adapter *padapter) { -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);del_timer_sync (&pmlmeext->link_timer);
@@ -2320,8 +2320,8 @@ static void start_clnt_auth(struct adapter *padapter)static void start_clnt_assoc (struct adapter *padapter) { -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);del_timer_sync (&pmlmeext->link_timer);
@@ -2337,9 +2337,9 @@ static unsigned int receive_disconnect(struct adapter *padapter, unsigned char *MacAddr, unsigned short reason) { -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);/* check A3 */ if (memcmp (MacAddr, pnetwork->MacAddress,ETH_ALEN ))
@@ -2511,11 +2511,11 @@ Following are the callback functions for each subtype of the management framesstatic unsigned int OnProbeReq (struct adapter *padapter,struct recv_frame *precv_frame) { -unsigned int ielen; -unsigned char *p; +unsigned int ielen; +unsigned char *p;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *cur = &(pmlmeinfo->network);u8 *pframe = precv_frame->pkt->data;uint len = precv_frame->pkt->len;
@@ -2546,7 +2546,7 @@ static unsigned int OnProbeReq(struct adapter *padapter,static unsigned int OnProbeRsp (struct adapter *padapter,struct recv_frame *precv_frame) { -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;if (pmlmeext->sitesurvey_res.state ==SCAN_PROCESS ) {report_survey_event (padapter, precv_frame);
@@ -2560,11 +2560,11 @@ static unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame) {int cam_idx; -struct sta_info *psta; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct sta_info *psta; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct sta_priv *pstapriv = &padapter->stapriv; +struct sta_priv *pstapriv = &padapter->stapriv;u8 *pframe = precv_frame->pkt->data;uint len = precv_frame->pkt->len;struct wlan_bssid_ex *pbss;
@@ -2651,17 +2651,17 @@ static unsigned int OnBeacon(struct adapter *padapter,static unsigned int OnAuth (struct adapter *padapter,struct recv_frame *precv_frame) { -unsigned int auth_mode, ie_len; +unsigned int auth_mode, ie_len;u16 seq; -unsigned char *sa, *p; +unsigned char *sa, *p;u16 algorithm; -int status; +int status;static struct sta_info stat; -struct sta_info *pstat =NULL ; -struct sta_priv *pstapriv = &padapter->stapriv; +struct sta_info *pstat =NULL ; +struct sta_priv *pstapriv = &padapter->stapriv;struct security_priv *psecuritypriv = &padapter->securitypriv; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);u8 *pframe = precv_frame->pkt->data;uint len = precv_frame->pkt->len;
@@ -2820,11 +2820,11 @@ static unsigned int OnAuth(struct adapter *padapter,static unsigned int OnAuthClient (struct adapter *padapter,struct recv_frame *precv_frame) { -unsigned int seq, len, status, offset; -unsigned char *p; -unsigned int go2asoc =0 ; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +unsigned int seq, len, status, offset; +unsigned char *p; +unsigned int go2asoc =0 ; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);u8 *pframe = precv_frame->pkt->data;uint pkt_len = precv_frame->pkt->len;
@@ -2899,18 +2899,18 @@ static unsigned int OnAssocReq(struct adapter *padapter,#ifdef CONFIG_88EU_AP_MODE u16 capab_info;struct rtw_ieee802_11_elems elems; -struct sta_info *pstat; -unsigned char reassoc, *p, *pos, *wpa_ie; +struct sta_info *pstat; +unsigned char reassoc, *p, *pos, *wpa_ie;unsigned char WMM_IE [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x00 ,0x01 }; -int i, wpa_ie_len, left; -unsigned char supportRate[16 ]; -int supportRateNum; -unsigned short status = _STATS_SUCCESSFUL_; -unsigned short frame_type, ie_offset =0 ; +int i, wpa_ie_len, left; +unsigned char supportRate[16 ]; +int supportRateNum; +unsigned short status = _STATS_SUCCESSFUL_; +unsigned short frame_type, ie_offset =0 ;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct security_priv *psecuritypriv = &padapter->securitypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *cur = &(pmlmeinfo->network);struct sta_priv *pstapriv = &padapter->stapriv;u8 *pframe = precv_frame->pkt->data;
@@ -3333,11 +3333,11 @@ static unsigned int OnAssocRsp(struct adapter *padapter, {uint i;int res; -unsigned short status; +unsigned short status;struct ndis_802_11_var_ie *pIE;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);/* struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); */ u8 *pframe = precv_frame->pkt->data;uint pkt_len = precv_frame->pkt->len;
@@ -3420,10 +3420,10 @@ static unsigned int OnAssocRsp(struct adapter *padapter,static unsigned int OnDeAuth (struct adapter *padapter,struct recv_frame *precv_frame) { -unsigned short reason; +unsigned short reason;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);u8 *pframe = precv_frame->pkt->data;struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
@@ -3476,8 +3476,8 @@ static unsigned int OnDisassoc(struct adapter *padapter, {u16 reason;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);u8 *pframe = precv_frame->pkt->data;struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
@@ -3588,11 +3588,11 @@ static unsigned int OnAction_back(struct adapter *padapter,u8 *addr;struct sta_info *psta =NULL ;struct recv_reorder_ctrl *preorder_ctrl; -unsigned char *frame_body; -unsigned char category, action; -unsigned short tid, status, reason_code =0 ; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +unsigned char *frame_body; +unsigned char category, action; +unsigned short tid, status, reason_code =0 ; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);u8 *pframe = precv_frame->pkt->data;struct sta_priv *pstapriv = &padapter->stapriv;/* check RA matches or not */
@@ -3812,9 +3812,9 @@ static unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_frame) {int i; -unsigned char category; +unsigned char category;struct action_handler *ptable; -unsigned char *frame_body; +unsigned char *frame_body;u8 *pframe = precv_frame->pkt->data; frame_body = (unsigned char *)(pframe +sizeof (struct ieee80211_hdr_3addr ));
@@ -3854,7 +3854,7 @@ static struct mlme_handler mlme_sta_tbl[] = {int init_hw_mlme_ext (struct adapter *padapter) { -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;set_channel_bwmode (padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode);return _SUCCESS;
@@ -3862,14 +3862,14 @@ int init_hw_mlme_ext(struct adapter *padapter)static void init_mlme_ext_priv_value (struct adapter *padapter) { -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -unsigned char mixed_datarate[NumRates] = { +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +unsigned char mixed_datarate[NumRates] = { _1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, _6M_RATE_, _9M_RATE_, _12M_RATE_, _18M_RATE_, _24M_RATE_, _36M_RATE_, - _48M_RATE_, _54M_RATE_,0xff + _48M_RATE_, _54M_RATE_,0xff }; -unsigned char mixed_basicrate[NumRates] = { +unsigned char mixed_basicrate[NumRates] = { _1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, _6M_RATE_, _12M_RATE_, _24M_RATE_,0xff , };
@@ -4030,7 +4030,7 @@ int init_mlme_ext_priv(struct adapter *padapter)struct registry_priv *pregistrypriv = &padapter->registrypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); pmlmeext->padapter = padapter;
@@ -4170,7 +4170,7 @@ void report_survey_event(struct adapter *padapter,struct cmd_obj *pcmd_obj;u8 *pevtcmd;u32 cmdsz; -struct survey_event *psurvey_evt; +struct survey_event *psurvey_evt;struct C2HEvent_Header *pc2h_evt_hdr;struct mlme_ext_priv *pmlmeext;struct cmd_priv *pcmdpriv;
@@ -4227,8 +4227,8 @@ void report_surveydone_event(struct adapter *padapter)u8 *pevtcmd;u32 cmdsz;struct surveydone_event *psurveydone_evt; -struct C2HEvent_Header *pc2h_evt_hdr; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct C2HEvent_Header *pc2h_evt_hdr; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct cmd_priv *pcmdpriv = &padapter->cmdpriv; pcmd_obj =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );
@@ -4269,10 +4269,10 @@ void report_join_res(struct adapter *padapter, int res)struct cmd_obj *pcmd_obj;u8 *pevtcmd;u32 cmdsz; -struct joinbss_event *pjoinbss_evt; -struct C2HEvent_Header *pc2h_evt_hdr; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct joinbss_event *pjoinbss_evt; +struct C2HEvent_Header *pc2h_evt_hdr; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct cmd_priv *pcmdpriv = &padapter->cmdpriv; pcmd_obj =kzalloc (sizeof (struct cmd_obj ),GFP_ATOMIC );
@@ -4319,10 +4319,10 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr,u8 *pevtcmd;u32 cmdsz;struct sta_info *psta; -int mac_id; -struct stadel_event *pdel_sta_evt; -struct C2HEvent_Header *pc2h_evt_hdr; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +int mac_id; +struct stadel_event *pdel_sta_evt; +struct C2HEvent_Header *pc2h_evt_hdr; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct cmd_priv *pcmdpriv = &padapter->cmdpriv; pcmd_obj =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );
@@ -4373,9 +4373,9 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr,struct cmd_obj *pcmd_obj;u8 *pevtcmd;u32 cmdsz; -struct stassoc_event *padd_sta_evt; -struct C2HEvent_Header *pc2h_evt_hdr; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct stassoc_event *padd_sta_evt; +struct C2HEvent_Header *pc2h_evt_hdr; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct cmd_priv *pcmdpriv = &padapter->cmdpriv; pcmd_obj =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );
@@ -4422,8 +4422,8 @@ Following are the event callback functionsvoid update_sta_info (struct adapter *padapter,struct sta_info *psta) {struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);/* ERP */ VCS_update (padapter, psta);
@@ -4461,11 +4461,11 @@ void update_sta_info(struct adapter *padapter, struct sta_info *psta)void mlmeext_joinbss_event_callback (struct adapter *padapter,int join_res) { -struct sta_info *psta, *psta_bmc; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct sta_info *psta, *psta_bmc; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); -struct sta_priv *pstapriv = &padapter->stapriv; +struct sta_priv *pstapriv = &padapter->stapriv;u8 join_type;u16 media_status;
@@ -4541,8 +4541,8 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)void mlmeext_sta_add_event_callback (struct adapter *padapter,struct sta_info *psta) { -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);u8 join_type;DBG_88E ("%s\n" , __func__);
@@ -4578,8 +4578,8 @@ void mlmeext_sta_add_event_callback(struct adapter *padapter, struct sta_info *pvoid mlmeext_sta_del_event_callback (struct adapter *padapter) { -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);if (is_client_associated_to_ap (padapter) ||is_IBSS_empty (padapter)) {rtw_hal_set_hwreg (padapter,HW_VAR_MLME_DISCONNECT ,NULL );
@@ -4630,12 +4630,12 @@ static u8 chk_ap_is_alive(struct adapter *padapter, struct sta_info *psta)void linked_status_chk (struct adapter *padapter) { -u32 i; -struct sta_info *psta; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct sta_priv *pstapriv = &padapter->stapriv; +u32 i; +struct sta_info *psta; +struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct sta_priv *pstapriv = &padapter->stapriv;if (is_client_associated_to_ap (padapter)) {/* linked infrastructure client mode */
@@ -4750,10 +4750,10 @@ void survey_timer_hdl(struct timer_list *t) {struct adapter *padapter =from_timer (padapter, t, mlmeextpriv.survey_timer); -struct cmd_obj *ph2c; -struct sitesurvey_parm *psurveyPara; -struct cmd_priv *pcmdpriv = &padapter->cmdpriv; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct cmd_obj *ph2c; +struct sitesurvey_parm *psurveyPara; +struct cmd_priv *pcmdpriv = &padapter->cmdpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;/* issue rtw_sitesurvey_cmd */ if (pmlmeext->sitesurvey_res.state >SCAN_START ) {
@@ -4790,8 +4790,8 @@ void link_timer_hdl(struct timer_list *t) {struct adapter *padapter =from_timer (padapter, t, mlmeextpriv.link_timer); -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);if (pmlmeinfo->state &WIFI_FW_AUTH_NULL ) {DBG_88E ("%s:no beacon while connecting\n" , __func__);
@@ -4826,7 +4826,7 @@ void link_timer_hdl(struct timer_list *t)void addba_timer_hdl (struct timer_list *t) {struct sta_info *psta =from_timer (psta, t, addba_retry_timer); -struct ht_priv *phtpriv; +struct ht_priv *phtpriv;if (!psta)return ;
@@ -4842,8 +4842,8 @@ void addba_timer_hdl(struct timer_list *t)u8 setopmode_hdl (struct adapter *padapter,u8 *pbuf) {u8 type; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct setopmode_parm *psetop = (struct setopmode_parm *)pbuf;if (psetop->mode == Ndis802_11APMode) {
@@ -4867,8 +4867,8 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf)u8 createbss_hdl (struct adapter *padapter,u8 *pbuf) { -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network));struct wlan_bssid_ex *pparm = (struct wlan_bssid_ex *)pbuf;/* u32 initialgain; */
@@ -4929,9 +4929,9 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) {u8 join_type;struct ndis_802_11_var_ie *pIE; -struct registry_priv *pregpriv = &padapter->registrypriv; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct registry_priv *pregpriv = &padapter->registrypriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network));struct wlan_bssid_ex *pparm = (struct wlan_bssid_ex *)pbuf;u32 i;
@@ -5041,8 +5041,8 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)u8 disconnect_hdl (struct adapter *padapter,unsigned char *pbuf) {struct disconnect_parm *param = (struct disconnect_parm *)pbuf; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network));u8 val8;
@@ -5088,7 +5088,7 @@ static int rtw_scan_ch_decision(struct adapter *padapter, {int i, j;int set_idx; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;/* clear out first */ memset (out,0 ,sizeof (struct rtw_ieee80211_channel )*out_num);
@@ -5127,12 +5127,12 @@ static int rtw_scan_ch_decision(struct adapter *padapter,u8 sitesurvey_cmd_hdl (struct adapter *padapter,u8 *pbuf) { -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct sitesurvey_parm *pparm = (struct sitesurvey_parm *)pbuf; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct sitesurvey_parm *pparm = (struct sitesurvey_parm *)pbuf;u8 bdelayscan = false;u8 val8; -u32 initialgain; -u32 i; +u32 initialgain; +u32 i;if (pmlmeext->sitesurvey_res.state ==SCAN_DISABLE ) {/* for first time sitesurvey_cmd */
@@ -5199,9 +5199,9 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf)u8 setauth_hdl (struct adapter *padapter,unsigned char *pbuf) { -struct setauth_parm *pparm = (struct setauth_parm *)pbuf; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct setauth_parm *pparm = (struct setauth_parm *)pbuf; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);if (pparm->mode <4 ) pmlmeinfo->auth_algo = pparm->mode;
@@ -5210,11 +5210,11 @@ u8 setauth_hdl(struct adapter *padapter, unsigned char *pbuf)u8 setkey_hdl (struct adapter *padapter,u8 *pbuf) { -unsigned short ctrl; -struct setkey_parm *pparm = (struct setkey_parm *)pbuf; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -unsigned char null_sta[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; +unsigned short ctrl; +struct setkey_parm *pparm = (struct setkey_parm *)pbuf; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +unsigned char null_sta[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 };/* main tx key for wep. */ if (pparm->set_tx)
@@ -5234,9 +5234,9 @@ u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf) {u16 ctrl =0 ;u8 cam_id;/* cam_entry */ -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct set_stakey_parm *pparm = (struct set_stakey_parm *)pbuf; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct set_stakey_parm *pparm = (struct set_stakey_parm *)pbuf;/* cam_entry: */ /* 0~3 for default key */
@@ -5303,9 +5303,9 @@ u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf)u8 add_ba_hdl (struct adapter *padapter,unsigned char *pbuf) { -struct addBaReq_parm *pparm = (struct addBaReq_parm *)pbuf; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct addBaReq_parm *pparm = (struct addBaReq_parm *)pbuf; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct sta_info *psta =rtw_get_stainfo (&padapter->stapriv, pparm->addr);
@@ -5325,11 +5325,11 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf)u8 set_tx_beacon_cmd (struct adapter *padapter) { -struct cmd_obj *ph2c; -struct wlan_bssid_ex *ptxBeacon_parm; -struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct cmd_obj *ph2c; +struct wlan_bssid_ex *ptxBeacon_parm; +struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);u8 res = _SUCCESS;int len_diff =0 ;
@@ -5364,7 +5364,7 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf) {u8 evt_code;u16 evt_sz; -uint *peventbuf; +uint *peventbuf;void (*event_callback)(struct adapter *dev,u8 *pbuf); peventbuf = (uint *)pbuf;
@@ -5408,7 +5408,7 @@ u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf)struct sta_info *psta_bmc;struct list_head *xmitframe_plist, *xmitframe_phead;struct xmit_frame *pxmitframe =NULL ; -struct sta_priv *pstapriv = &padapter->stapriv; +struct sta_priv *pstapriv = &padapter->stapriv;/* for BC/MC Frames */ psta_bmc =rtw_get_bcmc_stainfo (padapter);
@@ -5454,7 +5454,7 @@ u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf)u8 set_ch_hdl (struct adapter *padapter,u8 *pbuf) {struct set_ch_parm *set_ch_parm; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;if (!pbuf)return H2C_PARAMETERS_ERROR ;
@@ -5477,7 +5477,7 @@ u8 set_ch_hdl(struct adapter *padapter, u8 *pbuf)u8 set_chplan_hdl (struct adapter *padapter,unsigned char *pbuf) {struct SetChannelPlan_param *setChannelPlan_param; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;if (!pbuf)return H2C_PARAMETERS_ERROR ;
Signature · 1 line
2.20.1
PATCH v2 2/17 staging: rtl8188eu: replace tabs with spaces in rtw_mlme_ext.c
Replace tabs with spaces where appropriate.
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +6 -6
@@ -4025,7 +4025,7 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan,return chanset_size; } -int init_mlme_ext_priv (struct adapter *padapter) +int init_mlme_ext_priv (struct adapter *padapter) {struct registry_priv *pregistrypriv = &padapter->registrypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@@ -5205,7 +5205,7 @@ u8 setauth_hdl(struct adapter *padapter, unsigned char *pbuf)if (pparm->mode <4 ) pmlmeinfo->auth_algo = pparm->mode; -return H2C_SUCCESS ; +return H2C_SUCCESS ; }u8 setkey_hdl (struct adapter *padapter,u8 *pbuf)
@@ -5310,7 +5310,7 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf)struct sta_info *psta =rtw_get_stainfo (&padapter->stapriv, pparm->addr);if (!psta) -return H2C_SUCCESS ; +return H2C_SUCCESS ;if (((pmlmeinfo->state &WIFI_FW_ASSOC_SUCCESS ) && (pmlmeinfo->HT_enable)) || ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE )) {
@@ -5320,7 +5320,7 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf) }else { psta->htpriv.candidate_tid_bitmap &= ~BIT (pparm->tid); } -return H2C_SUCCESS ; +return H2C_SUCCESS ; }u8 set_tx_beacon_cmd (struct adapter *padapter)
@@ -5471,7 +5471,7 @@ u8 set_ch_hdl(struct adapter *padapter, u8 *pbuf)set_channel_bwmode (padapter, set_ch_parm->ch, set_ch_parm->ch_offset, set_ch_parm->bw); -return H2C_SUCCESS ; +return H2C_SUCCESS ; }u8 set_chplan_hdl (struct adapter *padapter,unsigned char *pbuf)
@@ -5487,5 +5487,5 @@ u8 set_chplan_hdl(struct adapter *padapter, unsigned char *pbuf) pmlmeext->max_chan_nums =init_channel_set (padapter, setChannelPlan_param->channel_plan, pmlmeext->channel_set);init_channel_list (padapter, pmlmeext->channel_set, pmlmeext->max_chan_nums, &pmlmeext->channel_list); -return H2C_SUCCESS ; +return H2C_SUCCESS ; }
Signature · 1 line
2.20.1
PATCH v2 3/17 staging: rtl8188eu: remove commented declarations in rtw_mlme_ext.c
In reply to Michael StraubeRemove unused/commented declarations.
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 3 --- 1 file changed, 3 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +0 -3
@@ -1828,7 +1828,6 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr) {struct sta_priv *pstapriv = &padapter->stapriv;struct sta_info *psta =NULL ; -/* struct recv_reorder_ctrl *preorder_ctrl; */ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);u16 tid;
@@ -3338,7 +3337,6 @@ static unsigned int OnAssocRsp(struct adapter *padapter,struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -/* struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); */ u8 *pframe = precv_frame->pkt->data;uint pkt_len = precv_frame->pkt->len;
@@ -4871,7 +4869,6 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf)struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network));struct wlan_bssid_ex *pparm = (struct wlan_bssid_ex *)pbuf; -/* u32 initialgain; */ if (pparm->InfrastructureMode == Ndis802_11APMode) {#ifdef CONFIG_88EU_AP_MODE
Signature · 1 line
2.20.1
PATCH v2 4/17 staging: rtl8188eu: remove blank lines between declarations
In reply to Michael StraubeRemove blank lines between declarations in rtw_mlme_ext.c.
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +0 -2
@@ -1868,7 +1868,6 @@ unsigned int send_beacon(struct adapter *padapter)u8 bxmitok = false;int issue =0 ;int poll =0 ; -unsigned long start = jiffies;rtw_hal_set_hwreg (padapter,HW_VAR_BCN_VALID ,NULL );
@@ -5303,7 +5302,6 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf)struct addBaReq_parm *pparm = (struct addBaReq_parm *)pbuf;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct sta_info *psta =rtw_get_stainfo (&padapter->stapriv, pparm->addr);if (!psta)
Signature · 1 line
2.20.1
PATCH v2 5/17 staging: rtl8188eu: add blank line after declarations
In reply to Michael StraubeAdd a missing blank line after declarations in rtw_mlme_ext.c.
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +1 -0
@@ -3592,6 +3592,7 @@ static unsigned int OnAction_back(struct adapter *padapter,struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);u8 *pframe = precv_frame->pkt->data;struct sta_priv *pstapriv = &padapter->stapriv; +/* check RA matches or not */ if (memcmp (myid (&(padapter->eeprompriv)),GetAddr1Ptr (pframe),ETH_ALEN ))/* for if1, sta/ap mode */
Signature · 1 line
2.20.1
PATCH v2 6/17 staging: rtl8188eu: remove unnecessary comments in rtw_mlme_ext.c
In reply to Michael StraubeRemove comments from 'endif's where the corresponding 'if' is just a few lines above to improve readability.
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +4 -4
@@ -333,7 +333,7 @@ static void issue_beacon(struct adapter *padapter, int timeout_ms) }#if defined(CONFIG_88EU_AP_MODE )spin_lock_bh (&pmlmepriv->bcn_update_lock); -#endif /* if defined (CONFIG_88EU_AP_MODE) */ +#endif /* update attribute */ pattrib = &pmgntframe->attrib;
@@ -436,7 +436,7 @@ static void issue_beacon(struct adapter *padapter, int timeout_ms) pmlmepriv->update_bcn = false;spin_unlock_bh (&pmlmepriv->bcn_update_lock); -#endif /* if defined (CONFIG_88EU_AP_MODE) */ +#endif if ((pattrib->pktlen +TXDESC_SIZE ) >512 ) {DBG_88E ("beacon frame too large\n" );
@@ -465,7 +465,7 @@ static void issue_probersp(struct adapter *padapter, unsigned char *da)u8 *pwps_ie;uint wps_ielen;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -#endif /* if defined (CONFIG_88EU_AP_MODE) */ +#endif struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
@@ -4087,7 +4087,7 @@ void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame)struct mlme_handler *ptable;#ifdef CONFIG_88EU_AP_MODE struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -#endif /* CONFIG_88EU_AP_MODE */ +#endif u8 bc_addr[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff };u8 *pframe = precv_frame->pkt->data;struct sta_info *psta =rtw_get_stainfo (&padapter->stapriv,GetAddr2Ptr (pframe));
Signature · 1 line
2.20.1
PATCH v2 7/17 staging: rtl8188eu: remove unnecessary parentheses in rtw_mlme_ext.c
In reply to Michael StraubeRemove unnecessary parentheses, most of them reported by checkpatch.
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 322 +++++++++--------- 1 file changed, 161 insertions(+), 161 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +161 -161
@@ -184,7 +184,7 @@ Following are some TX functions for WiFi MLMEvoid update_mgnt_tx_rate (struct adapter *padapter,u8 rate) { -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; pmlmeext->tx_rate = rate;DBG_88E ("%s(): rate = %x\n" , __func__, rate);
@@ -192,7 +192,7 @@ void update_mgnt_tx_rate(struct adapter *padapter, u8 rate)void update_mgntframe_attrib (struct adapter *padapter,struct pkt_attrib *pattrib) { -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;memset ((u8 *)(pattrib),0 ,sizeof (struct pkt_attrib ));
@@ -319,11 +319,11 @@ static void issue_beacon(struct adapter *padapter, int timeout_ms)struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned int rate_len; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;u8 bc_addr[] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; pmgntframe =alloc_mgtxmitframe (pxmitpriv);
@@ -349,7 +349,7 @@ static void issue_beacon(struct adapter *padapter, int timeout_ms) *(fctrl) =0 ;ether_addr_copy (pwlanhdr->addr1, bc_addr); -ether_addr_copy (pwlanhdr->addr2,myid (&(padapter->eeprompriv))); +ether_addr_copy (pwlanhdr->addr2,myid (&padapter->eeprompriv));ether_addr_copy (pwlanhdr->addr3, cur_network->MacAddress);SetSeqNum (pwlanhdr,0 /*pmlmeext->mgnt_seq*/ );
@@ -413,7 +413,7 @@ static void issue_beacon(struct adapter *padapter, int timeout_ms) pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, min_t(unsigned int, rate_len, 8), cur_network->SupportedRates, &pattrib->pktlen);/* DS parameter set */ - pframe =rtw_set_ie (pframe, _DSSET_IE_,1 , (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen); + pframe =rtw_set_ie (pframe, _DSSET_IE_,1 , (unsigned char *)&cur_network->Configuration.DSConfig, &pattrib->pktlen); {u8 erpinfo =0 ;
@@ -460,15 +460,15 @@ static void issue_probersp(struct adapter *padapter, unsigned char *da)struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned char *mac, *bssid; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv;#if defined(CONFIG_88EU_AP_MODE )u8 *pwps_ie;uint wps_ielen;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;#endif -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;unsigned int rate_len; pmgntframe =alloc_mgtxmitframe (pxmitpriv);
@@ -486,7 +486,7 @@ static void issue_probersp(struct adapter *padapter, unsigned char *da) pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct ieee80211_hdr *)pframe; - mac =myid (&(padapter->eeprompriv)); + mac =myid (&padapter->eeprompriv); bssid = cur_network->MacAddress; fctrl = &pwlanhdr->frame_control;
@@ -573,7 +573,7 @@ static void issue_probersp(struct adapter *padapter, unsigned char *da) pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, min_t(unsigned int, rate_len, 8), cur_network->SupportedRates, &pattrib->pktlen);/* DS parameter set */ - pframe =rtw_set_ie (pframe, _DSSET_IE_,1 , (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen); + pframe =rtw_set_ie (pframe, _DSSET_IE_,1 , (unsigned char *)&cur_network->Configuration.DSConfig, &pattrib->pktlen);if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_ADHOC_STATE ) {u8 erpinfo =0 ;
@@ -610,9 +610,9 @@ static int issue_probereq(struct adapter *padapter,__le16 *fctrl;unsigned char *mac;unsigned char bssrate[NumRates]; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;int bssrate_len =0 ;u8 bc_addr[] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff };
@@ -631,7 +631,7 @@ static int issue_probereq(struct adapter *padapter, pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct ieee80211_hdr *)pframe; - mac =myid (&(padapter->eeprompriv)); + mac =myid (&padapter->eeprompriv); fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;
@@ -656,17 +656,17 @@ static int issue_probereq(struct adapter *padapter, pattrib->pktlen =sizeof (struct ieee80211_hdr_3addr );if (pssid) - pframe =rtw_set_ie (pframe, _SSID_IE_, pssid->SsidLength, pssid->Ssid, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SSID_IE_, pssid->SsidLength, pssid->Ssid, &pattrib->pktlen);else - pframe =rtw_set_ie (pframe, _SSID_IE_,0 ,NULL , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SSID_IE_,0 ,NULL , &pattrib->pktlen);get_rate_set (padapter, bssrate, &bssrate_len);if (bssrate_len >8 ) { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , bssrate, &(pattrib->pktlen)); - pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len -8 ), (bssrate +8 ), &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , bssrate, &pattrib->pktlen); + pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, bssrate_len -8 , bssrate +8 , &pattrib->pktlen); }else { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, bssrate_len, bssrate, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, bssrate_len, bssrate, &pattrib->pktlen); }/* add wps_ie for wps2.0 */
@@ -749,10 +749,10 @@ static void issue_auth(struct adapter *padapter, struct sta_info *psta,__le16 le_val16;#endif int use_shared_key =0 ; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (pmgntframe ==NULL )
@@ -782,9 +782,9 @@ static void issue_auth(struct adapter *padapter, struct sta_info *psta,ether_addr_copy (pwlanhdr->addr1, psta->hwaddr);ether_addr_copy (pwlanhdr->addr2, -myid (&(padapter->eeprompriv))); +myid (&padapter->eeprompriv));ether_addr_copy (pwlanhdr->addr3, -myid (&(padapter->eeprompriv))); +myid (&padapter->eeprompriv));/* setting auth algo number */ val16 = (u16 )psta->authalg;
@@ -816,7 +816,7 @@ static void issue_auth(struct adapter *padapter, struct sta_info *psta,/* added challenging text... */ if ((psta->auth_seq ==2 ) && (psta->state &WIFI_FW_AUTH_STATE ) && (use_shared_key ==1 )) - pframe =rtw_set_ie (pframe, _CHLGETXT_IE_,128 , psta->chg_txt, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _CHLGETXT_IE_,128 , psta->chg_txt, &pattrib->pktlen);#endif }else {__le32 le_tmp32;
@@ -858,7 +858,7 @@ static void issue_auth(struct adapter *padapter, struct sta_info *psta,/* then checking to see if sending challenging text... */ if ((pmlmeinfo->auth_seq ==3 ) && (pmlmeinfo->state &WIFI_FW_AUTH_STATE ) && (use_shared_key ==1 )) { - pframe =rtw_set_ie (pframe, _CHLGETXT_IE_,128 , pmlmeinfo->chg_txt, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _CHLGETXT_IE_,128 , pmlmeinfo->chg_txt, &pattrib->pktlen);SetPrivacy (fctrl);
@@ -889,11 +889,11 @@ static void issue_asocrsp(struct adapter *padapter, unsigned short status,unsigned char *pbuf, *pframe;unsigned short val;__le16 *fctrl; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;u8 *ie = pnetwork->ies;__le16 lestatus, leval;
@@ -917,7 +917,7 @@ static void issue_asocrsp(struct adapter *padapter, unsigned short status,ether_addr_copy ((void *)GetAddr1Ptr (pwlanhdr), pstat->hwaddr);ether_addr_copy ((void *)GetAddr2Ptr (pwlanhdr), -myid (&(padapter->eeprompriv))); +myid (&padapter->eeprompriv));ether_addr_copy ((void *)GetAddr3Ptr (pwlanhdr), pnetwork->MacAddress);SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq);
@@ -944,10 +944,10 @@ static void issue_asocrsp(struct adapter *padapter, unsigned short status, pframe =rtw_set_fixed_ie (pframe, _ASOC_ID_, &leval, &pattrib->pktlen);if (pstat->bssratelen <=8 ) { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, pstat->bssratelen, pstat->bssrateset, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, pstat->bssratelen, pstat->bssrateset, &pattrib->pktlen); }else { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , pstat->bssrateset, &(pattrib->pktlen)); - pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (pstat->bssratelen-8 ), pstat->bssrateset+8 , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , pstat->bssrateset, &pattrib->pktlen); + pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, pstat->bssratelen-8 , pstat->bssrateset+8 , &pattrib->pktlen); }if ((pstat->flags &WLAN_STA_HT ) && (pmlmepriv->htpriv.ht_option)) {
@@ -990,7 +990,7 @@ static void issue_asocrsp(struct adapter *padapter, unsigned short status, }if (pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_REALTEK ) - pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_,6 ,REALTEK_96B_IE , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_,6 ,REALTEK_96B_IE , &pattrib->pktlen);/* add WPS IE ie for wps 2.0 */ if (pmlmepriv->wps_assoc_resp_ie && pmlmepriv->wps_assoc_resp_ie_len >0 ) {
@@ -1017,12 +1017,12 @@ static void issue_assocreq(struct adapter *padapter)unsigned char bssrate[NumRates], sta_bssrate[NumRates];struct ndis_802_11_var_ie *pIE;struct registry_priv *pregpriv = &padapter->registrypriv; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;int bssrate_len =0 , sta_bssrate_len =0 ; -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe)
@@ -1039,7 +1039,7 @@ static void issue_assocreq(struct adapter *padapter) fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;ether_addr_copy (pwlanhdr->addr1, pnetwork->MacAddress); -ether_addr_copy (pwlanhdr->addr2,myid (&(padapter->eeprompriv))); +ether_addr_copy (pwlanhdr->addr2,myid (&padapter->eeprompriv));ether_addr_copy (pwlanhdr->addr3, pnetwork->MacAddress);SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq);
@@ -1063,7 +1063,7 @@ static void issue_assocreq(struct adapter *padapter) pattrib->pktlen +=2 ;/* SSID */ - pframe =rtw_set_ie (pframe, _SSID_IE_, pmlmeinfo->network.Ssid.SsidLength, pmlmeinfo->network.Ssid.Ssid, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SSID_IE_, pmlmeinfo->network.Ssid.SsidLength, pmlmeinfo->network.Ssid.Ssid, &pattrib->pktlen);/* supported rate & extended supported rate */
@@ -1110,16 +1110,16 @@ static void issue_assocreq(struct adapter *padapter) }if (bssrate_len >8 ) { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , bssrate, &(pattrib->pktlen)); - pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len -8 ), (bssrate +8 ), &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , bssrate, &pattrib->pktlen); + pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, bssrate_len -8 , bssrate +8 , &pattrib->pktlen); }else { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, bssrate_len, bssrate, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, bssrate_len, bssrate, &pattrib->pktlen); }/* RSN */ p =rtw_get_ie ((pmlmeinfo->network.ies +sizeof (struct ndis_802_11_fixed_ie )), _RSN_IE_2_, &ie_len, (pmlmeinfo->network.ie_length -sizeof (struct ndis_802_11_fixed_ie )));if (p) - pframe =rtw_set_ie (pframe, _RSN_IE_2_, ie_len, (p +2 ), &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _RSN_IE_2_, ie_len, p +2 , &pattrib->pktlen);/* HT caps */ if (padapter->mlmepriv.htpriv.ht_option) {
@@ -1139,7 +1139,7 @@ static void issue_assocreq(struct adapter *padapter)if (pregpriv->rx_stbc) pmlmeinfo->HT_caps.cap_info |=cpu_to_le16 (0x0100 );/* RX STBC One spatial stream */ memcpy ((u8 *)&pmlmeinfo->HT_caps.mcs, MCS_rate_1R,16 ); - pframe =rtw_set_ie (pframe, _HT_CAPABILITY_IE_, ie_len, (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _HT_CAPABILITY_IE_, ie_len, (u8 *)(&pmlmeinfo->HT_caps), &pattrib->pktlen); } }
@@ -1159,7 +1159,7 @@ static void issue_assocreq(struct adapter *padapter)if (!memcmp (pIE->data,WPS_OUI ,4 )) pIE->Length =14 ; } - pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_, pIE->Length, pIE->data, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_, pIE->Length, pIE->data, &pattrib->pktlen); }break ;default :
@@ -1168,7 +1168,7 @@ static void issue_assocreq(struct adapter *padapter) }if (pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_REALTEK ) - pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_,6 ,REALTEK_96B_IE , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_,6 ,REALTEK_96B_IE , &pattrib->pktlen); pattrib->last_txcmdsz = pattrib->pktlen;dump_mgntframe (padapter, pmgntframe);
@@ -1200,10 +1200,10 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da,if (!padapter) goto exit; - pxmitpriv = &(padapter->xmitpriv); - pmlmeext = &(padapter->mlmeextpriv); - pmlmeinfo = &(pmlmeext->mlmext_info); - pnetwork = &(pmlmeinfo->network); + pxmitpriv = &padapter->xmitpriv; + pmlmeext = &padapter->mlmeextpriv; + pmlmeinfo = &pmlmeext->mlmext_info; + pnetwork = &pmlmeinfo->network; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe)
@@ -1231,7 +1231,7 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da,SetPwrMgt (fctrl);ether_addr_copy (pwlanhdr->addr1, da); -ether_addr_copy (pwlanhdr->addr2,myid (&(padapter->eeprompriv))); +ether_addr_copy (pwlanhdr->addr2,myid (&padapter->eeprompriv));ether_addr_copy (pwlanhdr->addr3, pnetwork->MacAddress);SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq);
@@ -1262,9 +1262,9 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da,int ret;int i =0 ;unsigned long start = jiffies; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;/* da == NULL, assume it's null data for sta to ap*/ if (da ==NULL )
@@ -1314,10 +1314,10 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da,struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned short *qc; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;DBG_88E ("%s\n" , __func__);
@@ -1360,7 +1360,7 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da,SetAckpolicy (qc, pattrib->ack_policy);ether_addr_copy (pwlanhdr->addr1, da); -ether_addr_copy (pwlanhdr->addr2,myid (&(padapter->eeprompriv))); +ether_addr_copy (pwlanhdr->addr2,myid (&padapter->eeprompriv));ether_addr_copy (pwlanhdr->addr3, pnetwork->MacAddress);SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq);
@@ -1391,9 +1391,9 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da,int ret;int i =0 ;unsigned long start = jiffies; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;/* da == NULL, assume it's null data for sta to ap*/ if (da ==NULL )
@@ -1440,10 +1440,10 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da,unsigned char *pframe;struct ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;int ret = _FAIL;__le16 le_tmp;
@@ -1465,7 +1465,7 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, *(fctrl) =0 ;ether_addr_copy (pwlanhdr->addr1, da); -ether_addr_copy (pwlanhdr->addr2,myid (&(padapter->eeprompriv))); +ether_addr_copy (pwlanhdr->addr2,myid (&padapter->eeprompriv));ether_addr_copy (pwlanhdr->addr3, pnetwork->MacAddress);SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq);
@@ -1556,13 +1556,13 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,u8 *pframe;struct ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct sta_info *psta;struct sta_priv *pstapriv = &padapter->stapriv;struct registry_priv *pregpriv = &padapter->registrypriv; -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;DBG_88E ("%s, category=%d, action=%d, status=%d\n" , __func__, category, action, status);
@@ -1583,7 +1583,7 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr, *(fctrl) =0 ;ether_addr_copy (pwlanhdr->addr1, raddr); -ether_addr_copy (pwlanhdr->addr2,myid (&(padapter->eeprompriv))); +ether_addr_copy (pwlanhdr->addr2,myid (&padapter->eeprompriv));ether_addr_copy (pwlanhdr->addr3, pnetwork->MacAddress);SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq);
@@ -1593,8 +1593,8 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr, pframe +=sizeof (struct ieee80211_hdr_3addr ); pattrib->pktlen =sizeof (struct ieee80211_hdr_3addr ); - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(action), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &category, &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &action, &pattrib->pktlen);if (category ==3 ) {switch (action) {
@@ -1602,7 +1602,7 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,do { pmlmeinfo->dialogToken++; }while (pmlmeinfo->dialogToken ==0 ); - pframe =rtw_set_fixed_ie (pframe,1 , &(pmlmeinfo->dialogToken), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &pmlmeinfo->dialogToken, &pattrib->pktlen); BA_para_set =0x1002 | ((status &0xf ) <<2 );/* immediate ack & 64 buffer size */ le_tmp =cpu_to_le16 (BA_para_set);
@@ -1703,14 +1703,14 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;struct wlan_network *pnetwork =NULL ; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct __queue *queue = &pmlmepriv->scanned_queue;u8 InfoContent[16 ] = {0 };u8 ICS [8 ][15 ]; -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;if ((pmlmepriv->num_FortyMHzIntolerant ==0 ) || (pmlmepriv->num_sta_no_ht ==0 ))return ;
@@ -1740,7 +1740,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) *(fctrl) =0 ;ether_addr_copy (pwlanhdr->addr1, cur_network->MacAddress); -ether_addr_copy (pwlanhdr->addr2,myid (&(padapter->eeprompriv))); +ether_addr_copy (pwlanhdr->addr2,myid (&padapter->eeprompriv));ether_addr_copy (pwlanhdr->addr3, cur_network->MacAddress);SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq);
@@ -1750,8 +1750,8 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) pframe +=sizeof (struct ieee80211_hdr_3addr ); pattrib->pktlen =sizeof (struct ieee80211_hdr_3addr ); - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(action), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &category, &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &action, &pattrib->pktlen);/* */ if (pmlmepriv->num_FortyMHzIntolerant >0 ) {
@@ -1759,7 +1759,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) iedata |=BIT (2 );/* 20 MHz BSS Width Request */ - pframe =rtw_set_ie (pframe, EID_BSSCoexistence,1 , &iedata, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, EID_BSSCoexistence,1 , &iedata, &pattrib->pktlen); }/* */
@@ -1767,7 +1767,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)if (pmlmepriv->num_sta_no_ht >0 ) {int i; -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock); phead =get_list_head (queue); plist = phead->next;
@@ -1814,7 +1814,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) } } - pframe =rtw_set_ie (pframe, EID_BSSIntolerantChlReport, k, InfoContent, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, EID_BSSIntolerantChlReport, k, InfoContent, &pattrib->pktlen); } } }
@@ -1829,7 +1829,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)struct sta_priv *pstapriv = &padapter->stapriv;struct sta_info *psta =NULL ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u16 tid;if ((pmlmeinfo->state&0x03 ) !=WIFI_FW_AP_STATE )
@@ -1909,7 +1909,7 @@ static void site_survey(struct adapter *padapter)unsigned char survey_channel =0 , val8;enum rt_scan_type ScanType =SCAN_PASSIVE ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u32 initialgain =0 ;struct rtw_ieee80211_channel *ch;
@@ -2023,7 +2023,7 @@ static u8 collect_bss_info(struct adapter *padapter,u8 ie_offset;struct registry_priv *pregistrypriv = &padapter->registrypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; len = packet_len -sizeof (struct ieee80211_hdr_3addr );
@@ -2186,8 +2186,8 @@ static void start_create_ibss(struct adapter *padapter)u8 val8;u8 join_type;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network)); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&pmlmeinfo->network); pmlmeext->cur_channel = (u8 )pnetwork->Configuration.DSConfig; pmlmeinfo->bcn_interval =get_beacon_interval (pnetwork);
@@ -2237,8 +2237,8 @@ static void start_clnt_join(struct adapter *padapter)unsigned short caps;u8 val8;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network)); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&pmlmeinfo->network);int beacon_timeout; pmlmeext->cur_channel = (u8 )pnetwork->Configuration.DSConfig;
@@ -2290,7 +2290,7 @@ static void start_clnt_join(struct adapter *padapter)static void start_clnt_auth (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;del_timer_sync (&pmlmeext->link_timer);
@@ -2308,7 +2308,7 @@ static void start_clnt_auth(struct adapter *padapter)/* issue deauth before issuing auth to deal with the situation */ /* Commented by Albert 2012/07/21 */ /* For the Win8 P2P connection, it will be hard to have a successful connection if this Wi-Fi doesn't connect to it. */ -issue_deauth (padapter, (&(pmlmeinfo->network))->MacAddress,WLAN_REASON_DEAUTH_LEAVING ); +issue_deauth (padapter, (&pmlmeinfo->network)->MacAddress,WLAN_REASON_DEAUTH_LEAVING );DBG_88E_LEVEL (_drv_info_,"start auth\n" );issue_auth (padapter,NULL ,0 );
@@ -2319,7 +2319,7 @@ static void start_clnt_auth(struct adapter *padapter)static void start_clnt_assoc (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;del_timer_sync (&pmlmeext->link_timer);
@@ -2336,8 +2336,8 @@ static unsigned int receive_disconnect(struct adapter *padapter, unsigned short reason) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;/* check A3 */ if (memcmp (MacAddr, pnetwork->MacAddress,ETH_ALEN ))
@@ -2513,8 +2513,8 @@ static unsigned int OnProbeReq(struct adapter *padapter,unsigned char *p;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur = &(pmlmeinfo->network); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur = &pmlmeinfo->network;u8 *pframe = precv_frame->pkt->data;uint len = precv_frame->pkt->len;
@@ -2560,14 +2560,14 @@ static unsigned int OnBeacon(struct adapter *padapter,int cam_idx;struct sta_info *psta;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct sta_priv *pstapriv = &padapter->stapriv;u8 *pframe = precv_frame->pkt->data;uint len = precv_frame->pkt->len;struct wlan_bssid_ex *pbss;int ret = _SUCCESS; -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;if (pmlmeext->sitesurvey_res.state ==SCAN_PROCESS ) {report_survey_event (padapter, precv_frame);
@@ -2580,8 +2580,8 @@ static unsigned int OnBeacon(struct adapter *padapter, pbss = (struct wlan_bssid_ex *)rtw_malloc (sizeof (struct wlan_bssid_ex ));if (pbss) {if (collect_bss_info (padapter, precv_frame, pbss) == _SUCCESS) { -update_network (&(pmlmepriv->cur_network.network), pbss, padapter, true); -rtw_get_bcn_info (&(pmlmepriv->cur_network)); +update_network (&pmlmepriv->cur_network.network, pbss, padapter, true); +rtw_get_bcn_info (&pmlmepriv->cur_network); }kfree (pbss); }
@@ -2659,7 +2659,7 @@ static unsigned int OnAuth(struct adapter *padapter,struct sta_priv *pstapriv = &padapter->stapriv;struct security_priv *psecuritypriv = &padapter->securitypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 *pframe = precv_frame->pkt->data;uint len = precv_frame->pkt->len;
@@ -2822,14 +2822,14 @@ static unsigned int OnAuthClient(struct adapter *padapter,unsigned char *p;unsigned int go2asoc =0 ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 *pframe = precv_frame->pkt->data;uint pkt_len = precv_frame->pkt->len;DBG_88E ("%s\n" , __func__);/* check A1 matches or not */ -if (memcmp (myid (&(padapter->eeprompriv)),get_da (pframe),ETH_ALEN )) +if (memcmp (myid (&padapter->eeprompriv),get_da (pframe),ETH_ALEN ))return _SUCCESS;if (!(pmlmeinfo->state &WIFI_FW_AUTH_STATE ))
@@ -2908,8 +2908,8 @@ static unsigned int OnAssocReq(struct adapter *padapter,struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct security_priv *psecuritypriv = &padapter->securitypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur = &(pmlmeinfo->network); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur = &pmlmeinfo->network;struct sta_priv *pstapriv = &padapter->stapriv;u8 *pframe = precv_frame->pkt->data;uint ie_len, pkt_len = precv_frame->pkt->len;
@@ -3335,14 +3335,14 @@ static unsigned int OnAssocRsp(struct adapter *padapter,struct ndis_802_11_var_ie *pIE;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 *pframe = precv_frame->pkt->data;uint pkt_len = precv_frame->pkt->len;DBG_88E ("%s\n" , __func__);/* check A1 matches or not */ -if (memcmp (myid (&(padapter->eeprompriv)),get_da (pframe),ETH_ALEN )) +if (memcmp (myid (&padapter->eeprompriv),get_da (pframe),ETH_ALEN ))return _SUCCESS;if (!(pmlmeinfo->state & (WIFI_FW_AUTH_SUCCESS |WIFI_FW_ASSOC_STATE )))
@@ -3420,9 +3420,9 @@ static unsigned int OnDeAuth(struct adapter *padapter,unsigned short reason;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 *pframe = precv_frame->pkt->data; -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;/* check A3 */ if (memcmp (GetAddr3Ptr (pframe), pnetwork->MacAddress,ETH_ALEN ))
@@ -3474,9 +3474,9 @@ static unsigned int OnDisassoc(struct adapter *padapter,u16 reason;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 *pframe = precv_frame->pkt->data; -struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network); +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;/* check A3 */ if (memcmp (GetAddr3Ptr (pframe), pnetwork->MacAddress,ETH_ALEN ))
@@ -3589,12 +3589,12 @@ static unsigned int OnAction_back(struct adapter *padapter,unsigned char category, action;unsigned short tid, status, reason_code =0 ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 *pframe = precv_frame->pkt->data;struct sta_priv *pstapriv = &padapter->stapriv;/* check RA matches or not */ -if (memcmp (myid (&(padapter->eeprompriv)),GetAddr1Ptr (pframe), +if (memcmp (myid (&padapter->eeprompriv),GetAddr1Ptr (pframe),ETH_ALEN ))/* for if1, sta/ap mode */ return _SUCCESS;
@@ -3620,8 +3620,8 @@ static unsigned int OnAction_back(struct adapter *padapter,DBG_88E ("%s, action=%d\n" , __func__, action);switch (action) {case RTW_WLAN_ACTION_ADDBA_REQ :/* ADDBA request */ -memcpy (&(pmlmeinfo->ADDBA_req), &(frame_body[2 ]),sizeof (struct ADDBA_request )); -process_addba_req (padapter, (u8 *)&(pmlmeinfo->ADDBA_req), addr); +memcpy (&pmlmeinfo->ADDBA_req, &frame_body[2 ],sizeof (struct ADDBA_request )); +process_addba_req (padapter, (u8 *)&pmlmeinfo->ADDBA_req, addr);/* 37 = reject ADDBA Req */ issue_action_BA(padapter, addr,
@@ -3663,7 +3663,7 @@ static unsigned int OnAction_back(struct adapter *padapter,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); +struct mlme_ext_priv *mlmeext = &adapter->mlmeextpriv;u8 *frame = recv_frame->pkt->data;u16 seq_ctrl = ((recv_frame->attrib.seq_num&0xffff ) <<4 ) | (recv_frame->attrib.frag_num &0xf );
@@ -3747,7 +3747,7 @@ static unsigned int on_action_public(struct adapter *padapter,u8 category, action;/* check RA matches or not */ -if (memcmp (myid (&(padapter->eeprompriv)),GetAddr1Ptr (pframe),ETH_ALEN )) +if (memcmp (myid (&padapter->eeprompriv),GetAddr1Ptr (pframe),ETH_ALEN )) goto exit; category = frame_body[0 ];
@@ -3861,7 +3861,7 @@ int init_hw_mlme_ext(struct adapter *padapter)static void init_mlme_ext_priv_value (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;unsigned char mixed_datarate[NumRates] = { _1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, _6M_RATE_, _9M_RATE_, _12M_RATE_, _18M_RATE_, _24M_RATE_, _36M_RATE_,
@@ -4027,8 +4027,8 @@ int init_mlme_ext_priv(struct adapter *padapter) {struct registry_priv *pregistrypriv = &padapter->registrypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; pmlmeext->padapter = padapter;
@@ -4270,7 +4270,7 @@ void report_join_res(struct adapter *padapter, int res)struct joinbss_event *pjoinbss_evt;struct C2HEvent_Header *pc2h_evt_hdr;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct cmd_priv *pcmdpriv = &padapter->cmdpriv; pcmd_obj =kzalloc (sizeof (struct cmd_obj ),GFP_ATOMIC );
@@ -4299,7 +4299,7 @@ void report_join_res(struct adapter *padapter, int res) pc2h_evt_hdr->seq =atomic_inc_return (&pmlmeext->event_seq); pjoinbss_evt = (struct joinbss_event *)(pevtcmd +sizeof (struct C2HEvent_Header )); -memcpy ((unsigned char *)(&(pjoinbss_evt->network.network)), &(pmlmeinfo->network),sizeof (struct wlan_bssid_ex )); +memcpy ((unsigned char *)(&pjoinbss_evt->network.network), &pmlmeinfo->network,sizeof (struct wlan_bssid_ex )); pjoinbss_evt->network.join_res = res; pjoinbss_evt->network.aid = res;
@@ -4349,7 +4349,7 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, pc2h_evt_hdr->seq =atomic_inc_return (&pmlmeext->event_seq); pdel_sta_evt = (struct stadel_event *)(pevtcmd +sizeof (struct C2HEvent_Header )); -ether_addr_copy ((unsigned char *)(&(pdel_sta_evt->macaddr)), MacAddr); +ether_addr_copy ((unsigned char *)(&pdel_sta_evt->macaddr), MacAddr);memcpy ((unsigned char *)(pdel_sta_evt->rsvd), (unsigned char *)(&reason),2 ); psta =rtw_get_stainfo (&padapter->stapriv, MacAddr);
@@ -4402,7 +4402,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, pc2h_evt_hdr->seq =atomic_inc_return (&pmlmeext->event_seq); padd_sta_evt = (struct stassoc_event *)(pevtcmd +sizeof (struct C2HEvent_Header )); -ether_addr_copy ((unsigned char *)(&(padd_sta_evt->macaddr)), MacAddr); +ether_addr_copy ((unsigned char *)(&padd_sta_evt->macaddr), MacAddr); padd_sta_evt->cam_id = cam_idx;DBG_88E ("%s: add STA\n" , __func__);
@@ -4419,9 +4419,9 @@ Following are the event callback functions/* for sta/adhoc mode */ void update_sta_info (struct adapter *padapter,struct sta_info *psta) { -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;/* ERP */ VCS_update (padapter, psta);
@@ -4461,8 +4461,8 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res) {struct sta_info *psta, *psta_bmc;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;struct sta_priv *pstapriv = &padapter->stapriv;u8 join_type;u16 media_status;
@@ -4539,8 +4539,8 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)void mlmeext_sta_add_event_callback (struct adapter *padapter,struct sta_info *psta) { -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 join_type;DBG_88E ("%s\n" , __func__);
@@ -4577,7 +4577,7 @@ void mlmeext_sta_add_event_callback(struct adapter *padapter, struct sta_info *pvoid mlmeext_sta_del_event_callback (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (is_client_associated_to_ap (padapter) ||is_IBSS_empty (padapter)) {rtw_hal_set_hwreg (padapter,HW_VAR_MLME_DISCONNECT ,NULL );
@@ -4630,9 +4630,9 @@ void linked_status_chk(struct adapter *padapter) {u32 i;struct sta_info *psta; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct sta_priv *pstapriv = &padapter->stapriv;if (is_client_associated_to_ap (padapter)) {
@@ -4789,7 +4789,7 @@ void link_timer_hdl(struct timer_list *t)struct adapter *padapter =from_timer (padapter, t, mlmeextpriv.link_timer);struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (pmlmeinfo->state &WIFI_FW_AUTH_NULL ) {DBG_88E ("%s:no beacon while connecting\n" , __func__);
@@ -4841,7 +4841,7 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf) {u8 type;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct setopmode_parm *psetop = (struct setopmode_parm *)pbuf;if (psetop->mode == Ndis802_11APMode) {
@@ -4866,8 +4866,8 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf)u8 createbss_hdl (struct adapter *padapter,u8 *pbuf) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network)); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&pmlmeinfo->network);struct wlan_bssid_ex *pparm = (struct wlan_bssid_ex *)pbuf;if (pparm->InfrastructureMode == Ndis802_11APMode) {
@@ -4928,8 +4928,8 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)struct ndis_802_11_var_ie *pIE;struct registry_priv *pregpriv = &padapter->registrypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network)); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&pmlmeinfo->network);struct wlan_bssid_ex *pparm = (struct wlan_bssid_ex *)pbuf;u32 i;
@@ -5039,8 +5039,8 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf) {struct disconnect_parm *param = (struct disconnect_parm *)pbuf;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network)); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&pmlmeinfo->network);u8 val8;if (is_client_associated_to_ap (padapter))
@@ -5198,7 +5198,7 @@ u8 setauth_hdl(struct adapter *padapter, unsigned char *pbuf) {struct setauth_parm *pparm = (struct setauth_parm *)pbuf;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (pparm->mode <4 ) pmlmeinfo->auth_algo = pparm->mode;
@@ -5210,7 +5210,7 @@ u8 setkey_hdl(struct adapter *padapter, u8 *pbuf)unsigned short ctrl;struct setkey_parm *pparm = (struct setkey_parm *)pbuf;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;unsigned char null_sta[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 };/* main tx key for wep. */
@@ -5232,7 +5232,7 @@ u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf)u16 ctrl =0 ;u8 cam_id;/* cam_entry */ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct set_stakey_parm *pparm = (struct set_stakey_parm *)pbuf;/* cam_entry: */
@@ -5302,7 +5302,7 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf) {struct addBaReq_parm *pparm = (struct addBaReq_parm *)pbuf;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct sta_info *psta =rtw_get_stainfo (&padapter->stapriv, pparm->addr);if (!psta)
@@ -5323,9 +5323,9 @@ u8 set_tx_beacon_cmd(struct adapter *padapter) {struct cmd_obj *ph2c;struct wlan_bssid_ex *ptxBeacon_parm; -struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); +struct cmd_priv *pcmdpriv = &padapter->cmdpriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 res = _SUCCESS;int len_diff =0 ;
@@ -5335,7 +5335,7 @@ u8 set_tx_beacon_cmd(struct adapter *padapter) goto exit; } - ptxBeacon_parm =kmemdup (&(pmlmeinfo->network), + ptxBeacon_parm =kmemdup (&pmlmeinfo->network,sizeof (struct wlan_bssid_ex ),GFP_ATOMIC );if (ptxBeacon_parm ==NULL ) {kfree (ph2c);
Signature · 1 line
2.20.1
PATCH v2 8/17 staging: rtl8188eu: remove unused arrays WFD_OUI and WMM_INFO_OUI
In reply to Michael StraubeThe arrays WFD_OUI and WMM_INFO_OUI are not used anywhere, so remove them.
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 -- drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 2 -- 2 files changed, 4 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +0 -2
@@ -26,9 +26,7 @@ unsigned char RTW_WPA_OUI[] = {0x00, 0x50, 0xf2, 0x01};unsigned char WMM_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 };unsigned char WPS_OUI [] = {0x00 ,0x50 ,0xf2 ,0x04 };unsigned char P2P_OUI [] = {0x50 ,0x6F ,0x9A ,0x09 }; -unsigned char WFD_OUI [] = {0x50 ,0x6F ,0x9A ,0x0A }; -unsigned char WMM_INFO_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x00 ,0x01 };unsigned char WMM_PARA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 };unsigned char WPA_TKIP_CIPHER [4 ] = {0x00 ,0x50 ,0xf2 ,0x02 };
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h +0 -2
@@ -84,10 +84,8 @@extern unsigned char RTW_WPA_OUI [];extern unsigned char WMM_OUI [];extern unsigned char WPS_OUI []; -extern unsigned char WFD_OUI [];extern unsigned char P2P_OUI []; -extern unsigned char WMM_INFO_OUI [];extern unsigned char WMM_PARA_OUI [];/* Channel Plan Type. */
Signature · 1 line
2.20.1
PATCH v2 9/17 staging: rtl8188eu: remove redundant declaration in rtw_mlme_ext.c
In reply to Michael StraubeThe array REALTEK_96B_IE is already declared in rtw_mlme.h, so remove the declaration in rtw_mlme_ext.c.
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +0 -2
@@ -32,8 +32,6 @@ unsigned char WMM_PARA_OUI[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01};unsigned char WPA_TKIP_CIPHER [4 ] = {0x00 ,0x50 ,0xf2 ,0x02 };unsigned char RSN_TKIP_CIPHER [4 ] = {0x00 ,0x0f ,0xac ,0x02 }; -extern unsigned char REALTEK_96B_IE []; -/******************************************************** MCS rate definitions *********************************************************/
Signature · 1 line
2.20.1
PATCH v2 10/17 staging: rtl8188eu: convert unsigned char arrays to u8
In reply to Michael StraubeChange the type of some arrays from unsigned char to u8.
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 16 +++++++------- .../staging/rtl8188eu/core/rtw_wlan_util.c | 22 +++++++++---------- drivers/staging/rtl8188eu/include/rtw_mlme.h | 6 ++--- .../staging/rtl8188eu/include/rtw_mlme_ext.h | 10 ++++----- 4 files changed, 27 insertions(+), 27 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +8 -8
@@ -22,15 +22,15 @@ static u8 null_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};/************************************************** OUI definitions for the vendor specific IE ***************************************************/ -unsigned char RTW_WPA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x01 }; -unsigned char WMM_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 }; -unsigned char WPS_OUI [] = {0x00 ,0x50 ,0xf2 ,0x04 }; -unsigned char P2P_OUI [] = {0x50 ,0x6F ,0x9A ,0x09 }; +u8 RTW_WPA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x01 }; +u8 WMM_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 }; +u8 WPS_OUI [] = {0x00 ,0x50 ,0xf2 ,0x04 }; +u8 P2P_OUI [] = {0x50 ,0x6F ,0x9A ,0x09 }; -unsigned char WMM_PARA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 }; +u8 WMM_PARA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 }; -unsigned char WPA_TKIP_CIPHER [4 ] = {0x00 ,0x50 ,0xf2 ,0x02 }; -unsigned char RSN_TKIP_CIPHER [4 ] = {0x00 ,0x0f ,0xac ,0x02 }; +u8 WPA_TKIP_CIPHER [4 ] = {0x00 ,0x50 ,0xf2 ,0x02 }; +u8 RSN_TKIP_CIPHER [4 ] = {0x00 ,0x0f ,0xac ,0x02 };/******************************************************** MCS rate definitions
@@ -5207,7 +5207,7 @@ u8 setkey_hdl(struct adapter *padapter, u8 *pbuf)struct setkey_parm *pparm = (struct setkey_parm *)pbuf;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -unsigned char null_sta[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; +u8 null_sta[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 };/* main tx key for wep. */ if (pparm->set_tx)
drivers/staging/rtl8188eu/core/rtw_wlan_util.c +11 -11
@@ -12,20 +12,20 @@#include <drv_types.h> #include <wifi.h> -static unsigned char ARTHEROS_OUI1 [] = {0x00 ,0x03 ,0x7f }; -static unsigned char ARTHEROS_OUI2 [] = {0x00 ,0x13 ,0x74 }; +static u8 ARTHEROS_OUI1 [] = {0x00 ,0x03 ,0x7f }; +static u8 ARTHEROS_OUI2 [] = {0x00 ,0x13 ,0x74 }; -static unsigned char BROADCOM_OUI1 [] = {0x00 ,0x10 ,0x18 }; -static unsigned char BROADCOM_OUI2 [] = {0x00 ,0x0a ,0xf7 }; +static u8 BROADCOM_OUI1 [] = {0x00 ,0x10 ,0x18 }; +static u8 BROADCOM_OUI2 [] = {0x00 ,0x0a ,0xf7 }; -static unsigned char CISCO_OUI [] = {0x00 ,0x40 ,0x96 }; -static unsigned char MARVELL_OUI [] = {0x00 ,0x50 ,0x43 }; -static unsigned char RALINK_OUI [] = {0x00 ,0x0c ,0x43 }; -static unsigned char REALTEK_OUI [] = {0x00 ,0xe0 ,0x4c }; -static unsigned char AIRGOCAP_OUI [] = {0x00 ,0x0a ,0xf5 }; -static unsigned char EPIGRAM_OUI [] = {0x00 ,0x90 ,0x4c }; +static u8 CISCO_OUI [] = {0x00 ,0x40 ,0x96 }; +static u8 MARVELL_OUI [] = {0x00 ,0x50 ,0x43 }; +static u8 RALINK_OUI [] = {0x00 ,0x0c ,0x43 }; +static u8 REALTEK_OUI [] = {0x00 ,0xe0 ,0x4c }; +static u8 AIRGOCAP_OUI [] = {0x00 ,0x0a ,0xf5 }; +static u8 EPIGRAM_OUI [] = {0x00 ,0x90 ,0x4c }; -unsigned char REALTEK_96B_IE [] = {0x00 ,0xe0 ,0x4c ,0x02 ,0x01 ,0x20 }; +u8 REALTEK_96B_IE [] = {0x00 ,0xe0 ,0x4c ,0x02 ,0x01 ,0x20 };#define R2T_PHY_DELAY (0)
drivers/staging/rtl8188eu/include/rtw_mlme.h +3 -3
@@ -211,9 +211,9 @@ int hostapd_mode_init(struct adapter *padapter);void hostapd_mode_unload (struct adapter *padapter);#endif -extern unsigned char WPA_TKIP_CIPHER [4 ]; -extern unsigned char RSN_TKIP_CIPHER [4 ]; -extern unsigned char REALTEK_96B_IE []; +extern u8 WPA_TKIP_CIPHER [4 ]; +extern u8 RSN_TKIP_CIPHER [4 ]; +extern u8 REALTEK_96B_IE [];extern const u8 MCS_rate_1R[16 ];void rtw_joinbss_event_prehandle (struct adapter *adapter,u8 *pbuf);
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h +5 -5
@@ -81,12 +81,12 @@#define _54M_RATE_ 11 -extern unsigned char RTW_WPA_OUI []; -extern unsigned char WMM_OUI []; -extern unsigned char WPS_OUI []; -extern unsigned char P2P_OUI []; +extern u8 RTW_WPA_OUI []; +extern u8 WMM_OUI []; +extern u8 WPS_OUI []; +extern u8 P2P_OUI []; -extern unsigned char WMM_PARA_OUI []; +extern u8 WMM_PARA_OUI [];/* Channel Plan Type. */ /* Note: */
Signature · 1 line
2.20.1
PATCH v2 11/17 staging: rtl8188eu: constify some arrays
In reply to Michael StraubeThe values of these arrays in rtw_mlme_ext.c and rtw_wlan_util.c are never changed, so make them const.
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 14 +++++----- .../staging/rtl8188eu/core/rtw_wlan_util.c | 26 +++++++++---------- drivers/staging/rtl8188eu/include/rtw_mlme.h | 4 +-- .../staging/rtl8188eu/include/rtw_mlme_ext.h | 10 +++---- 4 files changed, 27 insertions(+), 27 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +7 -7
@@ -22,15 +22,15 @@ static u8 null_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};/************************************************** OUI definitions for the vendor specific IE ***************************************************/ -u8 RTW_WPA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x01 }; -u8 WMM_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 }; -u8 WPS_OUI [] = {0x00 ,0x50 ,0xf2 ,0x04 }; -u8 P2P_OUI [] = {0x50 ,0x6F ,0x9A ,0x09 }; +const u8 RTW_WPA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x01 }; +const u8 WMM_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 }; +const u8 WPS_OUI [] = {0x00 ,0x50 ,0xf2 ,0x04 }; +const u8 P2P_OUI [] = {0x50 ,0x6F ,0x9A ,0x09 }; -u8 WMM_PARA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 }; +const u8 WMM_PARA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 }; -u8 WPA_TKIP_CIPHER [4 ] = {0x00 ,0x50 ,0xf2 ,0x02 }; -u8 RSN_TKIP_CIPHER [4 ] = {0x00 ,0x0f ,0xac ,0x02 }; +const u8 WPA_TKIP_CIPHER [4 ] = {0x00 ,0x50 ,0xf2 ,0x02 }; +const u8 RSN_TKIP_CIPHER [4 ] = {0x00 ,0x0f ,0xac ,0x02 };/******************************************************** MCS rate definitions
drivers/staging/rtl8188eu/core/rtw_wlan_util.c +13 -13
@@ -12,18 +12,18 @@#include <drv_types.h> #include <wifi.h> -static u8 ARTHEROS_OUI1 [] = {0x00 ,0x03 ,0x7f }; -static u8 ARTHEROS_OUI2 [] = {0x00 ,0x13 ,0x74 }; +static const u8 ARTHEROS_OUI1 [] = {0x00 ,0x03 ,0x7f }; +static const u8 ARTHEROS_OUI2 [] = {0x00 ,0x13 ,0x74 }; -static u8 BROADCOM_OUI1 [] = {0x00 ,0x10 ,0x18 }; -static u8 BROADCOM_OUI2 [] = {0x00 ,0x0a ,0xf7 }; +static const u8 BROADCOM_OUI1 [] = {0x00 ,0x10 ,0x18 }; +static const u8 BROADCOM_OUI2 [] = {0x00 ,0x0a ,0xf7 }; -static u8 CISCO_OUI [] = {0x00 ,0x40 ,0x96 }; -static u8 MARVELL_OUI [] = {0x00 ,0x50 ,0x43 }; -static u8 RALINK_OUI [] = {0x00 ,0x0c ,0x43 }; -static u8 REALTEK_OUI [] = {0x00 ,0xe0 ,0x4c }; -static u8 AIRGOCAP_OUI [] = {0x00 ,0x0a ,0xf5 }; -static u8 EPIGRAM_OUI [] = {0x00 ,0x90 ,0x4c }; +static const u8 CISCO_OUI [] = {0x00 ,0x40 ,0x96 }; +static const u8 MARVELL_OUI [] = {0x00 ,0x50 ,0x43 }; +static const u8 RALINK_OUI [] = {0x00 ,0x0c ,0x43 }; +static const u8 REALTEK_OUI [] = {0x00 ,0xe0 ,0x4c }; +static const u8 AIRGOCAP_OUI [] = {0x00 ,0x0a ,0xf5 }; +static const u8 EPIGRAM_OUI [] = {0x00 ,0x90 ,0x4c };u8 REALTEK_96B_IE [] = {0x00 ,0xe0 ,0x4c ,0x02 ,0x01 ,0x20 };
@@ -33,20 +33,20 @@ u8 REALTEK_96B_IE[] = {0x00, 0xe0, 0x4c, 0x02, 0x01, 0x20};#define WAIT_FOR_BCN_TO_MIN (6000)#define WAIT_FOR_BCN_TO_MAX (20000) -static u8 rtw_basic_rate_cck[4 ] = { +static const u8 rtw_basic_rate_cck[4 ] = {IEEE80211_CCK_RATE_1MB |IEEE80211_BASIC_RATE_MASK ,IEEE80211_CCK_RATE_2MB |IEEE80211_BASIC_RATE_MASK ,IEEE80211_CCK_RATE_5MB |IEEE80211_BASIC_RATE_MASK ,IEEE80211_CCK_RATE_11MB |IEEE80211_BASIC_RATE_MASK }; -static u8 rtw_basic_rate_ofdm[3 ] = { +static const u8 rtw_basic_rate_ofdm[3 ] = {IEEE80211_OFDM_RATE_6MB |IEEE80211_BASIC_RATE_MASK ,IEEE80211_OFDM_RATE_12MB |IEEE80211_BASIC_RATE_MASK ,IEEE80211_OFDM_RATE_24MB |IEEE80211_BASIC_RATE_MASK }; -static u8 rtw_basic_rate_mix[7 ] = { +static const u8 rtw_basic_rate_mix[7 ] = {IEEE80211_CCK_RATE_1MB |IEEE80211_BASIC_RATE_MASK ,IEEE80211_CCK_RATE_2MB |IEEE80211_BASIC_RATE_MASK ,IEEE80211_CCK_RATE_5MB |IEEE80211_BASIC_RATE_MASK ,
drivers/staging/rtl8188eu/include/rtw_mlme.h +2 -2
@@ -211,8 +211,8 @@ int hostapd_mode_init(struct adapter *padapter);void hostapd_mode_unload (struct adapter *padapter);#endif -extern u8 WPA_TKIP_CIPHER [4 ]; -extern u8 RSN_TKIP_CIPHER [4 ]; +extern const u8 WPA_TKIP_CIPHER [4 ]; +extern const u8 RSN_TKIP_CIPHER [4 ];extern u8 REALTEK_96B_IE [];extern const u8 MCS_rate_1R[16 ];
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h +5 -5
@@ -81,12 +81,12 @@#define _54M_RATE_ 11 -extern u8 RTW_WPA_OUI []; -extern u8 WMM_OUI []; -extern u8 WPS_OUI []; -extern u8 P2P_OUI []; +extern const u8 RTW_WPA_OUI []; +extern const u8 WMM_OUI []; +extern const u8 WPS_OUI []; +extern const u8 P2P_OUI []; -extern u8 WMM_PARA_OUI []; +extern const u8 WMM_PARA_OUI [];/* Channel Plan Type. */ /* Note: */
Signature · 1 line
2.20.1
PATCH v2 12/17 staging: rtl8188eu: make some arrays static in rtw_mlme_ext.c
In reply to Michael StraubeMake some arrays that are only used in rtw_mlme_ext.c static and remove the corresponding extern declarations from rtw_mlme_ext.h.
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 6 +++--- drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +3 -3
@@ -23,11 +23,11 @@ static u8 null_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};OUI definitions for the vendor specific IE ***************************************************/ const u8 RTW_WPA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x01 }; -const u8 WMM_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 }; +static const u8 WMM_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 };const u8 WPS_OUI [] = {0x00 ,0x50 ,0xf2 ,0x04 }; -const u8 P2P_OUI [] = {0x50 ,0x6F ,0x9A ,0x09 }; +static const u8 P2P_OUI [] = {0x50 ,0x6F ,0x9A ,0x09 }; -const u8 WMM_PARA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 }; +static const u8 WMM_PARA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 };const u8 WPA_TKIP_CIPHER [4 ] = {0x00 ,0x50 ,0xf2 ,0x02 };const u8 RSN_TKIP_CIPHER [4 ] = {0x00 ,0x0f ,0xac ,0x02 };
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h +0 -5
@@ -80,13 +80,8 @@#define _48M_RATE_ 10#define _54M_RATE_ 11 -extern const u8 RTW_WPA_OUI []; -extern const u8 WMM_OUI [];extern const u8 WPS_OUI []; -extern const u8 P2P_OUI []; - -extern const u8 WMM_PARA_OUI [];/* Channel Plan Type. */ /* Note: */
Signature · 1 line
2.20.1
PATCH v2 13/17 staging: rtl8188eu: change order of declarations to improve readability
In reply to Michael StraubeChange the order of array declarations in rtw_mlme_ext.c to improve readability.
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +1 -1
@@ -23,8 +23,8 @@ static u8 null_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};OUI definitions for the vendor specific IE ***************************************************/ const u8 RTW_WPA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x01 }; -static const u8 WMM_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 };const u8 WPS_OUI [] = {0x00 ,0x50 ,0xf2 ,0x04 }; +static const u8 WMM_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 };static const u8 P2P_OUI [] = {0x50 ,0x6F ,0x9A ,0x09 };static const u8 WMM_PARA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 };
Signature · 1 line
2.20.1
PATCH v2 14/17 staging: rtl8188eu: simplify null array initializations
In reply to Michael StraubeSimplfy initialization of null arrays to improve readability and save some lines.
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_xmit.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +2 -2
@@ -17,7 +17,7 @@#include <mlme_osdep.h> #include <recv_osdep.h> -static u8 null_addr[ETH_ALEN ] = {0 ,0 ,0 ,0 ,0 ,0 }; +static u8 null_addr[ETH_ALEN ] = {};/************************************************** OUI definitions for the vendor specific IE
@@ -5207,7 +5207,7 @@ u8 setkey_hdl(struct adapter *padapter, u8 *pbuf)struct setkey_parm *pparm = (struct setkey_parm *)pbuf;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -u8 null_sta[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; +u8 null_sta[ETH_ALEN ] = {};/* main tx key for wep. */ if (pparm->set_tx)
drivers/staging/rtl8188eu/core/rtw_xmit.c +2 -4
@@ -592,7 +592,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfrstruct pkt_attrib *pattrib = &pxmitframe->attrib;struct security_priv *psecuritypriv = &padapter->securitypriv;struct xmit_priv *pxmitpriv = &padapter->xmitpriv; -u8 priority[4 ] = {0x0 ,0x0 ,0x0 ,0x0 }; +u8 priority[4 ] = {};u8 hw_hdr_offset =0 ;if (pattrib->psta)
@@ -605,9 +605,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfrif (pattrib->encrypt == _TKIP_) {/* encode mic code */ if (stainfo) { -u8 null_key[16 ] = {0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 , -0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 , -0x0 ,0x0 }; +u8 null_key[16 ] = {}; pframe = pxmitframe->buf_addr + hw_hdr_offset;
Signature · 1 line
2.20.1
Greg KH
maintainerRe: [PATCH v2 14/17] staging: rtl8188eu: simplify null array initializations
Quoted 23 lines · Michael Straube
Simplfy initialization of null arrays to improve readability and save some lines.
Signed-off-by Michael Straube <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_xmit.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-)drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +1
-1@@ -17,7 +17,7 @@#include <mlme_osdep.h> #include <recv_osdep.h> -static u8 null_addr[ETH_ALEN ] = {0 ,0 ,0 ,0 ,0 ,0 }; +static u8 null_addr[ETH_ALEN ] = {};/************************************************** OUI definitions for the vendor specific IE
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c u8 setkey_hdl(struct adapter *padapter, u8 *pbuf) · line 5210
Quoted 5 lines
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +1
-1@@ -5207,7 +5207,7 @@ u8 setkey_hdl(struct adapter *padapter, u8 *pbuf)struct setkey_parm *pparm = (struct setkey_parm *)pbuf;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -u8 null_sta[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; +u8 null_sta[ETH_ALEN ] = {};
This just changed the type of the variable to a fixed size. I'm guessing it's ok, but it looks odd in a "cleanup patch"...
thanks,
greg k-h
PATCH v2 15/17 staging: rtl8188eu: change return type of is_basicrate() to bool
In reply to Michael StraubeThe function is_basicrate() returns true or false, so change the return type from int to bool.
--- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/core/rtw_wlan_util.c +1 -1
@@ -156,7 +156,7 @@ static unsigned char ratetbl_val_2wifirate(unsigned char rate) } } -static int is_basicrate (struct adapter *padapter,unsigned char rate) +static bool is_basicrate (struct adapter *padapter,unsigned char rate) {int i;unsigned char val;
Signature · 1 line
2.20.1
PATCH v2 16/17 staging: rtl8188eu: add spaces around '&' in rtw_mlme_ext.c
In reply to Michael StraubeAdd spaces around '&' to follow kernel coding style. Reported by checkpatch.
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +45 -45
@@ -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 *pDBG_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);
Signature · 1 line
2.20.1
PATCH v2 17/17 staging: rtl8188eu: cleanup brace coding style issues
In reply to Michael StraubeCleanup brace coding style issues reported by checkpatch.
ERROR: space required before the open brace '{'
WARNING: braces {} are not necessary for single statement blocks
CHECK: Unbalanced braces around else statement
--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 3 +-- drivers/staging/rtl8188eu/core/rtw_security.c | 4 ++-- drivers/staging/rtl8188eu/hal/phy.c | 4 ++-- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 7 +++---- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 3 +-- 5 files changed, 9 insertions(+), 12 deletions(-)
drivers/staging/rtl8188eu/core/rtw_cmd.c +1 -2
@@ -214,9 +214,8 @@ int rtw_cmd_thread(void *context) pcmdpriv->cmdthd_running = false;/* free all cmd_obj resources */ -while ((pcmd =rtw_dequeue_cmd (&pcmdpriv->cmd_queue))) { +while ((pcmd =rtw_dequeue_cmd (&pcmdpriv->cmd_queue)))rtw_free_cmd_obj (pcmd); - }complete (&pcmdpriv->terminate_cmdthread_comp);
drivers/staging/rtl8188eu/core/rtw_security.c +2 -2
@@ -1259,7 +1259,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe) length = pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;aes_cipher (prwskey, pattrib->hdrlen, pframe, length); - }else { + }else { length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;aes_cipher (prwskey, pattrib->hdrlen, pframe, length);
@@ -1267,7 +1267,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe) pframe = (u8 *)round_up ((size_t )(pframe),8 ); } } - }else { + }else {RT_TRACE (_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo==NULL!!!\n" , __func__)); res = _FAIL; }
drivers/staging/rtl8188eu/hal/phy.c +2 -2
@@ -437,9 +437,9 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt) thermal_val = (u8)(thermal_avg / thermal_avg_count);if (dm_odm->RFCalibrateInfo.bDoneTxpower && - !dm_odm->RFCalibrateInfo.bReloadtxpowerindex) + !dm_odm->RFCalibrateInfo.bReloadtxpowerindex) { delta =abs (thermal_val - dm_odm->RFCalibrateInfo.ThermalValue); -else { + }else { delta =abs (thermal_val - hal_data->EEPROMThermalMeter);if (dm_odm->RFCalibrateInfo.bReloadtxpowerindex) { dm_odm->RFCalibrateInfo.bReloadtxpowerindex = false;
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +3 -4
@@ -90,15 +90,14 @@ static s32 FillH2CCmd_88E(struct adapter *adapt, u8 ElementID, u32 CmdLen, u8 *p/* Write Ext command */ msgbox_ex_addr =REG_HMEBOX_EXT_0 + (h2c_box_num *RTL88E_EX_MESSAGE_BOX_SIZE ); -for (cmd_idx =0 ; cmd_idx < ext_cmd_len; cmd_idx++) { +for (cmd_idx =0 ; cmd_idx < ext_cmd_len; cmd_idx++)usb_write8 (adapt, msgbox_ex_addr+cmd_idx, *((u8 *)(&h2c_cmd_ex)+cmd_idx)); - } }/* Write command */ msgbox_addr =REG_HMEBOX_0 + (h2c_box_num *RTL88E_MESSAGE_BOX_SIZE ); -for (cmd_idx =0 ; cmd_idx <RTL88E_MESSAGE_BOX_SIZE ; cmd_idx++) { +for (cmd_idx =0 ; cmd_idx <RTL88E_MESSAGE_BOX_SIZE ; cmd_idx++)usb_write8 (adapt, msgbox_addr+cmd_idx, *((u8 *)(&h2c_cmd)+cmd_idx)); - } + bcmd_down = true; adapt->HalData->LastHMEBoxNum =
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +1 -2
@@ -232,9 +232,8 @@ s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy)/* Let last entry point to the start entry of ring buffer */ status =_LLTWrite (padapter, Last_Entry_Of_TxPktBuf, txpktbuf_bndy); -if (status != _SUCCESS) { +if (status != _SUCCESS)return status; - } }return status;
Signature · 1 line
2.20.1