lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <54F0A234.5090404@lwfinger.net>
Date:	Fri, 27 Feb 2015 10:58:28 -0600
From:	Larry Finger <Larry.Finger@...inger.net>
To:	Matteo Semenzato <mattew8898@...il.com>,
	gregkh@...uxfoundation.org, oat.elena@...il.com,
	andriy.shevchenko@...ux.intel.com, hejianet@...il.com,
	tapaswenipathak@...il.com, cengelma@....at,
	dan.carpenter@...cle.com, abelmoyo.ab@...il.com,
	kristina.martsenko@...il.com, standby24x7@...il.com,
	sudipm.mukherjee@...il.com
CC:	devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] Staging: rtl8188eu: fix coding style errors

On 02/27/2015 10:44 AM, Matteo Semenzato wrote:
> From: Matteo Semenzato <mattew8898@...il.com>
>
> This patch fixes the following errors:
> ERROR: space prohibited before that ',' (ctx:WxW)
> ERROR: space prohibited before that ',' (ctx:WxW)
> ERROR: switch and case should be at the same indent
>
> Signed-off-by: Matteo Semenzato <mattew8898@...il.com>

I appreciate your efforts, but you are not improving the source. Running 
scripts/checkpatch.pl against your patch results in the following summary:

total: 60 errors, 32 warnings, 352 lines checked

You have fixed 60 errors, and introduced 60 new ones. :(

NACK.

Larry

> ---
>   drivers/staging/rtl8188eu/core/rtw_efuse.c     |  2 +-
>   drivers/staging/rtl8188eu/core/rtw_ieee80211.c |  8 +++---
>   drivers/staging/rtl8188eu/core/rtw_mlme.c      | 20 ++++++-------
>   drivers/staging/rtl8188eu/core/rtw_mlme_ext.c  | 40 +++++++++++++-------------
>   drivers/staging/rtl8188eu/core/rtw_sta_mgt.c   | 14 ++++-----
>   drivers/staging/rtl8188eu/core/rtw_xmit.c      | 36 +++++++++++------------
>   6 files changed, 60 insertions(+), 60 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c
> index 8816d11..c31fdbc 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
> @@ -31,7 +31,7 @@
>
>   enum{
>   		VOLTAGE_V25						= 0x03,
> -		LDOE25_SHIFT						= 28 ,
> +		LDOE25_SHIFT						= 28,
>   	};
>
>   /*
> diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
> index f2c3ca7..2a0f4ff 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
> @@ -789,7 +789,7 @@ u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen)
>    *
>    * Returns: the address of the specific WPS attribute found, or NULL
>    */
> -u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id , u8 *buf_attr, u32 *len_attr)
> +u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_attr, u32 *len_attr)
>   {
>   	u8 *attr_ptr = NULL;
>   	u8 *target_attr_ptr = NULL;
> @@ -799,7 +799,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id , u8 *buf_at
>   		*len_attr = 0;
>
>   	if ((wps_ie[0] != _VENDOR_SPECIFIC_IE_) ||
> -	    (memcmp(wps_ie + 2, wps_oui , 4)))
> +	    (memcmp(wps_ie + 2, wps_oui, 4)))
>   		return attr_ptr;
>
>   	/*  6 = 1(Element ID) + 1(Length) + 4(WPS OUI) */
> @@ -835,7 +835,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id , u8 *buf_at
>    *
>    * Returns: the address of the specific WPS attribute content found, or NULL
>    */
> -u8 *rtw_get_wps_attr_content(u8 *wps_ie, uint wps_ielen, u16 target_attr_id , u8 *buf_content, uint *len_content)
> +u8 *rtw_get_wps_attr_content(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_content, uint *len_content)
>   {
>   	u8 *attr_ptr;
>   	u32 attr_len;
> @@ -1239,7 +1239,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)
>   	} else {
>   		pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_OPENSYS;
>   	}
> -	rtw_get_sec_ie(pnetwork->network.IEs , pnetwork->network.IELength, NULL, &rsn_len, NULL, &wpa_len);
> +	rtw_get_sec_ie(pnetwork->network.IEs, pnetwork->network.IELength, NULL, &rsn_len, NULL, &wpa_len);
>   	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: ssid =%s\n", pnetwork->network.Ssid.Ssid));
>   	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: wpa_len =%d rsn_len =%d\n", wpa_len, rsn_len));
>   	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("rtw_get_bcn_info: ssid =%s\n", pnetwork->network.Ssid.Ssid));
> diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> index d4632da..f620b3e 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
> @@ -141,7 +141,7 @@ struct	wlan_network *_rtw_alloc_network(struct	mlme_priv *pmlmepriv)/* _queue *f
>   	}
>   	plist = free_queue->queue.next;
>
> -	pnetwork = container_of(plist , struct wlan_network, list);
> +	pnetwork = container_of(plist, struct wlan_network, list);
>
>   	list_del_init(&pnetwork->list);
>
> @@ -160,7 +160,7 @@ exit:
>   	return pnetwork;
>   }
>
> -static void _rtw_free_network(struct	mlme_priv *pmlmepriv , struct wlan_network *pnetwork, u8 isfreeall)
> +static void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 isfreeall)
>   {
>   	u32 curr_time, delta_time;
>   	u32 lifetime = SCANQUEUE_LIFETIME;
> @@ -219,7 +219,7 @@ struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *addr)
>   	plist = phead->next;
>
>   	while (plist != phead) {
> -		pnetwork = container_of(plist, struct wlan_network , list);
> +		pnetwork = container_of(plist, struct wlan_network, list);
>   		if (!memcmp(addr, pnetwork->network.MacAddress, ETH_ALEN))
>   			break;
>   		plist = plist->next;
> @@ -581,7 +581,7 @@ static int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *
>   }
>
>   /* TODO: Perry: For Power Management */
> -void rtw_atimdone_event_callback(struct adapter	*adapter , u8 *pbuf)
> +void rtw_atimdone_event_callback(struct adapter	*adapter, u8 *pbuf)
>   {
>   	RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("receive atimdone_evet\n"));
>   	return;
> @@ -614,7 +614,7 @@ void rtw_survey_event_callback(struct adapter	*adapter, u8 *pbuf)
>   			spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
>   			ibss_wlan = rtw_find_network(&pmlmepriv->scanned_queue,  pnetwork->MacAddress);
>   			if (ibss_wlan) {
> -				memcpy(ibss_wlan->network.IEs , pnetwork->IEs, 8);
> +				memcpy(ibss_wlan->network.IEs, pnetwork->IEs, 8);
>   				spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
>   				goto exit;
>   			}
> @@ -722,15 +722,15 @@ void rtw_surveydone_event_callback(struct adapter	*adapter, u8 *pbuf)
>   	pmlmeext = &adapter->mlmeextpriv;
>   }
>
> -void rtw_dummy_event_callback(struct adapter *adapter , u8 *pbuf)
> +void rtw_dummy_event_callback(struct adapter *adapter, u8 *pbuf)
>   {
>   }
>
> -void rtw_fwdbg_event_callback(struct adapter *adapter , u8 *pbuf)
> +void rtw_fwdbg_event_callback(struct adapter *adapter, u8 *pbuf)
>   {
>   }
>
> -static void free_scanqueue(struct	mlme_priv *pmlmepriv)
> +static void free_scanqueue(struct mlme_priv *pmlmepriv)
>   {
>   	struct __queue *free_queue = &pmlmepriv->free_bss_pool;
>   	struct __queue *scan_queue = &pmlmepriv->scanned_queue;
> @@ -1381,7 +1381,7 @@ void _rtw_join_timeout_handler (void *function_context)
>   				DBG_88E("%s try another roaming\n", __func__);
>   				do_join_r = rtw_do_join(adapter);
>   				if (_SUCCESS != do_join_r) {
> -					DBG_88E("%s roaming do_join return %d\n", __func__ , do_join_r);
> +					DBG_88E("%s roaming do_join return %d\n", __func__, do_join_r);
>   					continue;
>   				}
>   				break;
> @@ -1995,7 +1995,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
>   		p = rtw_get_ie(in_ie+12, _HT_ADD_INFO_IE_, &ielen, in_len-12);
>   		if (p && (ielen == sizeof(struct ieee80211_ht_addt_info))) {
>   			out_len = *pout_len;
> -			rtw_set_ie(out_ie+out_len, _HT_ADD_INFO_IE_, ielen, p+2 , pout_len);
> +			rtw_set_ie(out_ie+out_len, _HT_ADD_INFO_IE_, ielen, p+2, pout_len);
>   		}
>   	}
>   	return phtpriv->ht_option;
> diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> index cd12dd7..cb92ba4 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> @@ -605,7 +605,7 @@ unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame)
>   				ret = rtw_check_bcn_info(padapter, pframe, len);
>   				if (!ret) {
>   						DBG_88E_LEVEL(_drv_info_, "ap has changed, disconnect now\n ");
> -						receive_disconnect(padapter, pmlmeinfo->network.MacAddress , 65535);
> +						receive_disconnect(padapter, pmlmeinfo->network.MacAddress, 65535);
>   						return _SUCCESS;
>   				}
>   				/* update WMM, ERP in the beacon */
> @@ -762,7 +762,7 @@ unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame)
>   			/* checking for challenging txt... */
>   			DBG_88E("checking for challenging txt...\n");
>
> -			p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + 4 + _AUTH_IE_OFFSET_ , _CHLGETXT_IE_, (int *)&ie_len,
> +			p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + 4 + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, (int *)&ie_len,
>   					len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ - 4);
>
>   			if ((p == NULL) || (ie_len <= 0)) {
> @@ -804,7 +804,7 @@ unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame)
>   auth_fail:
>
>   	if (pstat)
> -		rtw_free_stainfo(padapter , pstat);
> +		rtw_free_stainfo(padapter, pstat);
>
>   	pstat = &stat;
>   	memset((char *)pstat, '\0', sizeof(stat));
> @@ -1008,7 +1008,7 @@ unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv_frame
>   		memcpy(supportRate, p+2, ie_len);
>   		supportRateNum = ie_len;
>
> -		p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _EXT_SUPPORTEDRATES_IE_ , &ie_len,
> +		p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _EXT_SUPPORTEDRATES_IE_, &ie_len,
>   				pkt_len - WLAN_HDR_A3_LEN - ie_offset);
>   		if (p !=  NULL) {
>   			if (supportRateNum <= sizeof(supportRate)) {
> @@ -1108,7 +1108,7 @@ unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv_frame
>   			if (pmlmepriv->wps_beacon_ie) {
>   				u8 selected_registrar = 0;
>
> -				rtw_get_wps_attr_content(pmlmepriv->wps_beacon_ie, pmlmepriv->wps_beacon_ie_len, WPS_ATTR_SELECTED_REGISTRAR , &selected_registrar, NULL);
> +				rtw_get_wps_attr_content(pmlmepriv->wps_beacon_ie, pmlmepriv->wps_beacon_ie_len, WPS_ATTR_SELECTED_REGISTRAR, &selected_registrar, NULL);
>
>   				if (!selected_registrar) {
>   					DBG_88E("selected_registrar is false , or AP is not ready to do WPS\n");
> @@ -1478,7 +1478,7 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame)
>   		DBG_88E_LEVEL(_drv_always_, "sta recv deauth reason code(%d) sta:%pM\n",
>   			      reason, GetAddr3Ptr(pframe));
>
> -		receive_disconnect(padapter, GetAddr3Ptr(pframe) , reason);
> +		receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
>   	}
>   	pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
>   	return _SUCCESS;
> @@ -2324,10 +2324,10 @@ static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps
>   	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 */
> @@ -2592,13 +2592,13 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i
>   	/* capability */
>   	val = *(unsigned short *)rtw_get_capability_from_ie(ie);
>
> -	pframe = rtw_set_fixed_ie(pframe, _CAPABILITY_ , (unsigned char *)&val, &(pattrib->pktlen));
> +	pframe = rtw_set_fixed_ie(pframe, _CAPABILITY_, (unsigned char *)&val, &(pattrib->pktlen));
>
>   	lestatus = cpu_to_le16(status);
> -	pframe = rtw_set_fixed_ie(pframe , _STATUS_CODE_ , (unsigned char *)&lestatus, &(pattrib->pktlen));
> +	pframe = rtw_set_fixed_ie(pframe, _STATUS_CODE_, (unsigned char *)&lestatus, &(pattrib->pktlen));
>
>   	leval = cpu_to_le16(pstat->aid | BIT(14) | BIT(15));
> -	pframe = rtw_set_fixed_ie(pframe, _ASOC_ID_ , (unsigned char *)&leval, &(pattrib->pktlen));
> +	pframe = rtw_set_fixed_ie(pframe, _ASOC_ID_, (unsigned char *)&leval, &(pattrib->pktlen));
>
>   	if (pstat->bssratelen <= 8) {
>   		pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, pstat->bssratelen, pstat->bssrateset, &(pattrib->pktlen));
> @@ -2647,7 +2647,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i
>   	}
>
>   	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) {
> @@ -2717,7 +2717,7 @@ void issue_assocreq(struct adapter *padapter)
>   	/* listen interval */
>   	/* todo: listen interval for power saving */
>   	le_tmp = cpu_to_le16(3);
> -	memcpy(pframe , (unsigned char *)&le_tmp, 2);
> +	memcpy(pframe, (unsigned char *)&le_tmp, 2);
>   	pframe += 2;
>   	pattrib->pktlen += 2;
>
> @@ -2770,10 +2770,10 @@ 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 */
> @@ -2815,7 +2815,7 @@ void issue_assocreq(struct adapter *padapter)
>   				memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R, 16);
>   				break;
>   			}
> -			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));
>   		}
>   	}
>
> @@ -2845,7 +2845,7 @@ 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);
> @@ -3147,7 +3147,7 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned s
>   	pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
>
>   	le_tmp = cpu_to_le16(reason);
> -	pframe = rtw_set_fixed_ie(pframe, _RSON_CODE_ , (unsigned char *)&le_tmp, &(pattrib->pktlen));
> +	pframe = rtw_set_fixed_ie(pframe, _RSON_CODE_, (unsigned char *)&le_tmp, &(pattrib->pktlen));
>
>   	pattrib->last_txcmdsz = pattrib->pktlen;
>
> diff --git a/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c b/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
> index dc9d0dd..c7f1b99 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
> @@ -158,7 +158,7 @@ static void rtw_mfree_all_stainfo(struct sta_priv *pstapriv)
>   	plist = phead->next;
>
>   	while (phead != plist) {
> -		psta = container_of(plist, struct sta_info , list);
> +		psta = container_of(plist, struct sta_info, list);
>   		plist = plist->next;
>   	}
>
> @@ -187,7 +187,7 @@ u32	_rtw_free_sta_priv(struct	sta_priv *pstapriv)
>
>   			while (phead != plist) {
>   				int i;
> -				psta = container_of(plist, struct sta_info , hash_list);
> +				psta = container_of(plist, struct sta_info, hash_list);
>   				plist = plist->next;
>
>   				for (i = 0; i < 16; i++) {
> @@ -259,7 +259,7 @@ struct	sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
>
>   		RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_info_,
>   			 ("alloc number_%d stainfo  with hwaddr = %pM\n",
> -			 pstapriv->asoc_sta_count , hwaddr));
> +			 pstapriv->asoc_sta_count, hwaddr));
>
>   		init_addba_retry_timer(pstapriv->padapter, psta);
>
> @@ -293,7 +293,7 @@ exit:
>   }
>
>   /*  using pstapriv->sta_hash_lock to protect */
> -u32	rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)
> +u32	rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)
>   {
>   	int i;
>   	struct __queue *pfree_sta_queue;
> @@ -334,7 +334,7 @@ u32	rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)
>   	spin_unlock_bh(&pxmitpriv->lock);
>
>   	list_del_init(&psta->hash_list);
> -	RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_err_, ("\n free number_%d stainfo  with hwaddr=0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x\n", pstapriv->asoc_sta_count , psta->hwaddr[0], psta->hwaddr[1], psta->hwaddr[2], psta->hwaddr[3], psta->hwaddr[4], psta->hwaddr[5]));
> +	RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_err_, ("\n free number_%d stainfo  with hwaddr=0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x\n", pstapriv->asoc_sta_count, psta->hwaddr[0], psta->hwaddr[1], psta->hwaddr[2], psta->hwaddr[3], psta->hwaddr[4], psta->hwaddr[5]));
>   	pstapriv->asoc_sta_count--;
>
>   	/*  re-init sta_info; 20061114 */
> @@ -442,12 +442,12 @@ void rtw_free_all_stainfo(struct adapter *padapter)
>   		plist = phead->next;
>
>   		while (phead != plist) {
> -			psta = container_of(plist, struct sta_info , hash_list);
> +			psta = container_of(plist, struct sta_info, hash_list);
>
>   			plist = plist->next;
>
>   			if (pbcmc_stainfo != psta)
> -				rtw_free_stainfo(padapter , psta);
> +				rtw_free_stainfo(padapter, psta);
>   		}
>   	}
>   	spin_unlock_bh(&pstapriv->sta_hash_lock);
> diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c
> index 7a71df1..2f5cd0a 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
> @@ -640,7 +640,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
>   	if (pattrib->psta)
>   		stainfo = pattrib->psta;
>   	else
> -		stainfo = rtw_get_stainfo(&padapter->stapriv , &pattrib->ra[0]);
> +		stainfo = rtw_get_stainfo(&padapter->stapriv, &pattrib->ra[0]);
>
>
>   	hw_hdr_offset = TXDESC_SIZE + (pxmitframe->pkt_offset * PACKET_OFFSET_SZ);
> @@ -1026,22 +1026,22 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
>   		/* adding icv, if necessary... */
>   		if (pattrib->iv_len) {
>   			switch (pattrib->encrypt) {
> -				case _WEP40_:
> -				case _WEP104_:
> -					WEP_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx);
> -					break;
> -				case _TKIP_:
> -					if (bmcst)
> -						TKIP_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx);
> -					else
> -						TKIP_IV(pattrib->iv, psta->dot11txpn, 0);
> -					break;
> -				case _AES_:
> -					if (bmcst)
> -						AES_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx);
> -					else
> -						AES_IV(pattrib->iv, psta->dot11txpn, 0);
> -					break;
> +			case _WEP40_:
> +			case _WEP104_:
> +				WEP_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx);
> +				break;
> +			case _TKIP_:
> +				if (bmcst)
> +					TKIP_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx);
> +				else
> +					TKIP_IV(pattrib->iv, psta->dot11txpn, 0);
> +				break;
> +			case _AES_:
> +				if (bmcst)
> +					AES_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx);
> +				else
> +					AES_IV(pattrib->iv, psta->dot11txpn, 0);
> +				break;
>   			}
>
>   			memcpy(pframe, pattrib->iv, pattrib->iv_len);
> @@ -1711,7 +1711,7 @@ static void do_queue_select(struct adapter	*padapter, struct pkt_attrib *pattrib
>   	u8 qsel;
>
>   	qsel = pattrib->priority;
> -	RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("### do_queue_select priority=%d , qsel = %d\n", pattrib->priority , qsel));
> +	RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("### do_queue_select priority=%d, qsel = %d\n", pattrib->priority, qsel));
>
>   	pattrib->qsel = qsel;
>   }
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ