* [PATCH V2 1/2] staging: rtl8188eu: Fix style errors and warnings
@ 2015-07-18 9:59 Guillaume Bienkowski
2015-07-18 9:59 ` [PATCH V2 2/2] staging: rtl8188eu: core: Use tabs for indentation Guillaume Bienkowski
0 siblings, 1 reply; 4+ messages in thread
From: Guillaume Bienkowski @ 2015-07-18 9:59 UTC (permalink / raw)
To: gregkh; +Cc: luca, devel, linux-kernel, Guillaume Bienkowski
Fix spaces before comma and indentation.
Signed-off-by: Guillaume Bienkowski <guitreize@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 42 +++++++++++++--------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index a0b8f66..27d7561 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -672,10 +672,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 */
@@ -944,13 +944,13 @@ static void issue_asocrsp(struct adapter *padapter, unsigned short status,
/* 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));
@@ -999,7 +999,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) {
@@ -1069,7 +1069,7 @@ static 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;
@@ -1122,10 +1122,10 @@ 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 */
@@ -1167,7 +1167,7 @@ static 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));
}
}
@@ -1197,7 +1197,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);
@@ -1499,7 +1499,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;
@@ -2681,7 +2681,7 @@ static unsigned int OnBeacon(struct adapter *padapter,
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 */
@@ -2839,7 +2839,7 @@ static unsigned int OnAuth(struct adapter *padapter,
/* 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)) {
@@ -3083,7 +3083,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
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)) {
@@ -3183,10 +3183,10 @@ static unsigned int OnAssocReq(struct adapter *padapter,
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");
+ DBG_88E("selected_registrar is false, or AP is not ready to do WPS\n");
status = _STATS_UNABLE_HANDLE_STA_;
@@ -3547,7 +3547,7 @@ static unsigned int OnDeAuth(struct adapter *padapter,
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;
@@ -4709,7 +4709,7 @@ void _linked_rx_signal_strehgth_display(struct adapter *padapter);
void _linked_rx_signal_strehgth_display(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);
u8 mac_id;
int UndecoratedSmoothedPWDB;
if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE)
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH V2 2/2] staging: rtl8188eu: core: Use tabs for indentation
2015-07-18 9:59 [PATCH V2 1/2] staging: rtl8188eu: Fix style errors and warnings Guillaume Bienkowski
@ 2015-07-18 9:59 ` Guillaume Bienkowski
2015-07-20 5:48 ` Sudip Mukherjee
0 siblings, 1 reply; 4+ messages in thread
From: Guillaume Bienkowski @ 2015-07-18 9:59 UTC (permalink / raw)
To: gregkh; +Cc: luca, devel, linux-kernel, Guillaume Bienkowski
Signed-off-by: Guillaume Bienkowski <guitreize@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 1a00d1b0..23bc1bf 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -4709,7 +4709,7 @@ void _linked_rx_signal_strehgth_display(struct adapter *padapter);
void _linked_rx_signal_strehgth_display(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);
u8 mac_id;
int UndecoratedSmoothedPWDB;
if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE)
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH V2 2/2] staging: rtl8188eu: core: Use tabs for indentation
2015-07-18 9:59 ` [PATCH V2 2/2] staging: rtl8188eu: core: Use tabs for indentation Guillaume Bienkowski
@ 2015-07-20 5:48 ` Sudip Mukherjee
2015-07-20 6:52 ` Guillaume Bienkowski
0 siblings, 1 reply; 4+ messages in thread
From: Sudip Mukherjee @ 2015-07-20 5:48 UTC (permalink / raw)
To: Guillaume Bienkowski; +Cc: gregkh, devel, linux-kernel
On Sat, Jul 18, 2015 at 11:59:34AM +0200, Guillaume Bienkowski wrote:
> Signed-off-by: Guillaume Bienkowski <guitreize@gmail.com>
> ---
> drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> index 1a00d1b0..23bc1bf 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> @@ -4709,7 +4709,7 @@ void _linked_rx_signal_strehgth_display(struct adapter *padapter);
> void _linked_rx_signal_strehgth_display(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);
> u8 mac_id;
> int UndecoratedSmoothedPWDB;
> if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE)
This patch is not applying as this same change you have done in your
previous patch (1/2).
regards
sudip
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH V2 2/2] staging: rtl8188eu: core: Use tabs for indentation
2015-07-20 5:48 ` Sudip Mukherjee
@ 2015-07-20 6:52 ` Guillaume Bienkowski
0 siblings, 0 replies; 4+ messages in thread
From: Guillaume Bienkowski @ 2015-07-20 6:52 UTC (permalink / raw)
To: Sudip Mukherjee; +Cc: gregkh, devel, linux-kernel
On Mon, Jul 20, 2015 at 11:18:10AM +0530, Sudip Mukherjee wrote:
> On Sat, Jul 18, 2015 at 11:59:34AM +0200, Guillaume Bienkowski wrote:
> > Signed-off-by: Guillaume Bienkowski <guitreize@gmail.com>
> > ---
> > drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> > index 1a00d1b0..23bc1bf 100644
> > --- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> > +++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
> > @@ -4709,7 +4709,7 @@ void _linked_rx_signal_strehgth_display(struct adapter *padapter);
> > void _linked_rx_signal_strehgth_display(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);
> > u8 mac_id;
> > int UndecoratedSmoothedPWDB;
> > if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE)
> This patch is not applying as this same change you have done in your
> previous patch (1/2).
>
> regards
> sudip
Hi Sudip, you are right. So much for me for splitting the patches.
I'll rework that, thank you.
Guillaume
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-07-20 6:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-18 9:59 [PATCH V2 1/2] staging: rtl8188eu: Fix style errors and warnings Guillaume Bienkowski
2015-07-18 9:59 ` [PATCH V2 2/2] staging: rtl8188eu: core: Use tabs for indentation Guillaume Bienkowski
2015-07-20 5:48 ` Sudip Mukherjee
2015-07-20 6:52 ` Guillaume Bienkowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox