Re: [PATCH][V2] Staging:rtl8723au: open/closed brace issue

2014-10-29 Thread Greg KH
On Sun, Oct 26, 2014 at 03:10:22PM +, Paul McQuade wrote:
 ERROR: that open brace { should be on the previous line
 
 Signed-off-by: Paul McQuade paulmcq...@gmail.com
 ---
  drivers/staging/rtl8723au/core/rtw_ap.c | 130 
 ++--
  1 file changed, 40 insertions(+), 90 deletions(-)

This doesn't apply to my tree :(
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH][V2] Staging:rtl8723au: open/closed brace issue

2014-10-26 Thread Paul McQuade
ERROR: that open brace { should be on the previous line

Signed-off-by: Paul McQuade paulmcq...@gmail.com
---
 drivers/staging/rtl8723au/core/rtw_ap.c | 130 ++--
 1 file changed, 40 insertions(+), 90 deletions(-)

diff --git a/drivers/staging/rtl8723au/core/rtw_ap.c 
b/drivers/staging/rtl8723au/core/rtw_ap.c
index 6b4092f..6b69bfe 100644
--- a/drivers/staging/rtl8723au/core/rtw_ap.c
+++ b/drivers/staging/rtl8723au/core/rtw_ap.c
@@ -231,12 +231,10 @@ void  expire_timeout_chk23a(struct rtw_adapter 
*padapter)
psta-expire_to--;
}
 
-   if (psta-expire_to = 0)
-   {
+   if (psta-expire_to = 0) {
struct mlme_ext_priv *pmlmeext = padapter-mlmeextpriv;
 
-   if (padapter-registrypriv.wifi_spec == 1)
-   {
+   if (padapter-registrypriv.wifi_spec == 1) {
psta-expire_to = pstapriv-expire_to;
continue;
}
@@ -308,15 +306,13 @@ void  expire_timeout_chk23a(struct rtw_adapter 
*padapter)
ret = issue_nulldata23a(padapter, psta-hwaddr, 0, 3, 
50);
 
psta-keep_alive_trycnt++;
-   if (ret == _SUCCESS)
-   {
+   if (ret == _SUCCESS) {
DBG_8723A(asoc check, sta( MAC_FMT ) is alive\n, 
MAC_ARG(psta-hwaddr));
psta-expire_to = pstapriv-expire_to;
psta-keep_alive_trycnt = 0;
continue;
-   }
-   else if (psta-keep_alive_trycnt = 3)
-   {
+
+   } else if (psta-keep_alive_trycnt = 3) {
DBG_8723A(ack check for asoc expire, keep_alive_trycnt 
=%d\n, psta-keep_alive_trycnt);
psta-expire_to = 1;
continue;
@@ -363,8 +359,7 @@ void add_RATid23a(struct rtw_adapter *padapter, struct 
sta_info *psta, u8 rssi_l
return;
 
/* b/g mode ra_bitmap */
-   for (i = 0; i  sizeof(psta-bssrateset); i++)
-   {
+   for (i = 0; i  sizeof(psta-bssrateset); i++) {
if (psta-bssrateset[i])
tx_ra_bitmap |= 
rtw_get_bit_value_from_ieee_value23a(psta-bssrateset[i]0x7f);
}
@@ -406,8 +401,7 @@ void add_RATid23a(struct rtw_adapter *padapter, struct 
sta_info *psta, u8 rssi_l
raid = networktype_to_raid23a(sta_band);
init_rate = get_highest_rate_idx23a(tx_ra_bitmap0x0fff)0x3f;
 
-   if (psta-aid  NUM_STA)
-   {
+   if (psta-aid  NUM_STA) {
u8 arg = 0;
 
arg = psta-mac_id0x1f;
@@ -436,9 +430,7 @@ void add_RATid23a(struct rtw_adapter *padapter, struct 
sta_info *psta, u8 rssi_l
psta-raid = raid;
psta-init_rate = init_rate;
 
-   }
-   else
-   {
+   } else {
DBG_8723A(station aid %d exceed the max number\n, psta-aid);
}
 }
@@ -522,9 +513,7 @@ static void update_bmc_sta(struct rtw_adapter *padapter)
psta-state = _FW_LINKED;
spin_unlock_bh(psta-lock);
 
-   }
-   else
-   {
+   } else {
DBG_8723A(add_RATid23a_bmc_sta error!\n);
}
 }
@@ -561,8 +550,7 @@ void update_sta_info23a_apmode23a(struct rtw_adapter 
*padapter, struct sta_info
/* ERP */
VCS_update23a(padapter, psta);
/* HT related cap */
-   if (phtpriv_sta-ht_option)
-   {
+   if (phtpriv_sta-ht_option) {
/* check if sta supports rx ampdu */
phtpriv_sta-ampdu_enable = phtpriv_ap-ampdu_enable;
 
@@ -580,9 +568,7 @@ void update_sta_info23a_apmode23a(struct rtw_adapter 
*padapter, struct sta_info
 
psta-qos_option = true;
 
-   }
-   else
-   {
+   } else {
phtpriv_sta-ampdu_enable = false;
 
phtpriv_sta-sgi = false;
@@ -1261,8 +1247,7 @@ void update_beacon23a(struct rtw_adapter *padapter, u8 
ie_id, u8 *oui, u8 tx)
 
spin_lock_bh(pmlmepriv-bcn_update_lock);
 
-   switch (ie_id)
-   {
+   switch (ie_id) {
case 0xFF:
/* 8: TimeStamp, 2: Beacon Interval 2:Capability */
update_bcn_fixed_ie(padapter);
@@ -1416,110 +1401,85 @@ void bss_cap_update_on_sta_join23a(struct rtw_adapter 
*padapter, struct sta_info
struct mlme_priv *pmlmepriv = padapter-mlmepriv;
struct mlme_ext_priv *pmlmeext = padapter-mlmeextpriv;
 
-   if (!(psta-flags  WLAN_STA_SHORT_PREAMBLE))
-   {
-   if (!psta-no_short_preamble_set)
-   {
+   if (!(psta-flags  WLAN_STA_SHORT_PREAMBLE)) {
+   if (!psta-no_short_preamble_set) {
psta-no_short_preamble_set = 1;
 
pmlmepriv-num_sta_no_short_preamble++;