2013-09-10 08:38:40

by farisdehaan

[permalink] [raw]
Subject: [PATCH] Staging: rtl8188eu: rtw_wlan_util.c: Fixed checkpatch.pl warnings.

From: Faris de Haan <[email protected]>

Fixed a few of the coding style issues reported by checkpatch.pl

Signed-off-by: Faris de Haan <[email protected]>
---
drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
index 013ea48..e7fd751 100644
--- a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
@@ -80,7 +80,7 @@ int cckratesonly_included(unsigned char *rate, int ratelen)
for (i = 0; i < ratelen; i++) {
if ((((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) &&
(((rate[i]) & 0x7f) != 11) && (((rate[i]) & 0x7f) != 22))
- return false;
+ return false;
}

return true;
@@ -766,7 +766,7 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_802_11_var_ie *pIE)

for (i = 0; i < (pIE->Length); i++) {
if (i != 2) {
- /* Got the endian issue here. */
+ /* Got the endian issue here. */
pmlmeinfo->HT_caps.u.HT_cap[i] &= (pIE->data[i]);
} else {
/* modify from fw by Thomas 2010/11/17 */
@@ -1186,7 +1186,7 @@ unsigned int should_forbid_n_rate(struct adapter *padapter)
case _RSN_IE_2_:
if ((_rtw_memcmp((pIE->data + 8), RSN_CIPHER_SUITE_CCMP, 4)) ||
(_rtw_memcmp((pIE->data + 12), RSN_CIPHER_SUITE_CCMP, 4)))
- return false;
+ return false;
default:
break;
}
@@ -1368,21 +1368,21 @@ void update_tx_basic_rate(struct adapter *padapter, u8 wirelessmode)
#ifdef CONFIG_88EU_P2P
struct wifidirect_info *pwdinfo = &padapter->wdinfo;

- /* Added by Albert 2011/03/22 */
- /* In the P2P mode, the driver should not support the b mode. */
- /* So, the Tx packet shouldn't use the CCK rate */
+ /* Added by Albert 2011/03/22 */
+ /* In the P2P mode, the driver should not support the b mode. */
+ /* So, the Tx packet shouldn't use the CCK rate */
if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return;
#endif /* CONFIG_88EU_P2P */
_rtw_memset(supported_rates, 0, NDIS_802_11_LENGTH_RATES_EX);

- if ((wirelessmode & WIRELESS_11B) && (wirelessmode == WIRELESS_11B)) {
+ if ((wirelessmode & WIRELESS_11B) && (wirelessmode == WIRELESS_11B))
memcpy(supported_rates, rtw_basic_rate_cck, 4);
- } else if (wirelessmode & WIRELESS_11B) {
+ else if (wirelessmode & WIRELESS_11B)
memcpy(supported_rates, rtw_basic_rate_mix, 7);
- } else {
+ else
memcpy(supported_rates, rtw_basic_rate_ofdm, 3);
- }
+

if (wirelessmode & WIRELESS_11B)
update_mgnt_tx_rate(padapter, IEEE80211_CCK_RATE_1MB);
@@ -1435,7 +1435,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
DBG_88E("link to Airgo Cap\n");
return HT_IOT_PEER_AIRGO;
} else if (_rtw_memcmp(pIE->data, EPIGRAM_OUI, 3)) {
- epigram_vendor_flag = 1;
+ epigram_vendor_flag = 1;
if (ralink_vendor_flag) {
DBG_88E("link to Tenda W311R AP\n");
return HT_IOT_PEER_TENDA;
--
1.7.10.4


2013-09-10 14:30:06

by Larry Finger

[permalink] [raw]
Subject: Re: [PATCH] Staging: rtl8188eu: rtw_wlan_util.c: Fixed checkpatch.pl warnings.

On 09/10/2013 03:38 AM, [email protected] wrote:
> From: Faris de Haan <[email protected]>
>
> Fixed a few of the coding style issues reported by checkpatch.pl
>
> Signed-off-by: Faris de Haan <[email protected]>
> ---
> drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
> index 013ea48..e7fd751 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
> @@ -80,7 +80,7 @@ int cckratesonly_included(unsigned char *rate, int ratelen)
> for (i = 0; i < ratelen; i++) {
> if ((((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) &&
> (((rate[i]) & 0x7f) != 11) && (((rate[i]) & 0x7f) != 22))
> - return false;
> + return false;
> }
>
> return true;
> @@ -766,7 +766,7 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_802_11_var_ie *pIE)
>
> for (i = 0; i < (pIE->Length); i++) {
> if (i != 2) {
> - /* Got the endian issue here. */
> + /* Got the endian issue here. */
> pmlmeinfo->HT_caps.u.HT_cap[i] &= (pIE->data[i]);
> } else {
> /* modify from fw by Thomas 2010/11/17 */
> @@ -1186,7 +1186,7 @@ unsigned int should_forbid_n_rate(struct adapter *padapter)
> case _RSN_IE_2_:
> if ((_rtw_memcmp((pIE->data + 8), RSN_CIPHER_SUITE_CCMP, 4)) ||
> (_rtw_memcmp((pIE->data + 12), RSN_CIPHER_SUITE_CCMP, 4)))
> - return false;
> + return false;
> default:
> break;
> }
> @@ -1368,21 +1368,21 @@ void update_tx_basic_rate(struct adapter *padapter, u8 wirelessmode)
> #ifdef CONFIG_88EU_P2P
> struct wifidirect_info *pwdinfo = &padapter->wdinfo;
>
> - /* Added by Albert 2011/03/22 */
> - /* In the P2P mode, the driver should not support the b mode. */
> - /* So, the Tx packet shouldn't use the CCK rate */
> + /* Added by Albert 2011/03/22 */
> + /* In the P2P mode, the driver should not support the b mode. */
> + /* So, the Tx packet shouldn't use the CCK rate */
> if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
> return;
> #endif /* CONFIG_88EU_P2P */
> _rtw_memset(supported_rates, 0, NDIS_802_11_LENGTH_RATES_EX);
>
> - if ((wirelessmode & WIRELESS_11B) && (wirelessmode == WIRELESS_11B)) {
> + if ((wirelessmode & WIRELESS_11B) && (wirelessmode == WIRELESS_11B))
> memcpy(supported_rates, rtw_basic_rate_cck, 4);
> - } else if (wirelessmode & WIRELESS_11B) {
> + else if (wirelessmode & WIRELESS_11B)
> memcpy(supported_rates, rtw_basic_rate_mix, 7);
> - } else {
> + else
> memcpy(supported_rates, rtw_basic_rate_ofdm, 3);
> - }
> +
>
> if (wirelessmode & WIRELESS_11B)
> update_mgnt_tx_rate(padapter, IEEE80211_CCK_RATE_1MB);
> @@ -1435,7 +1435,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
> DBG_88E("link to Airgo Cap\n");
> return HT_IOT_PEER_AIRGO;
> } else if (_rtw_memcmp(pIE->data, EPIGRAM_OUI, 3)) {
> - epigram_vendor_flag = 1;
> + epigram_vendor_flag = 1;
> if (ralink_vendor_flag) {
> DBG_88E("link to Tenda W311R AP\n");
> return HT_IOT_PEER_TENDA;
>

Acked-by: Larry Finger <[email protected]>

Thanks,

Larry