Staging: rtl8821ae: hal_bt_coexist: fix commenting style
PATCH 1/12 Staging: rtl8821ae: hal_bt_coexist: fix commenting style
Fix commenting style from C99 comments to C89 comments
--- drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c +1 -1
@@ -44,7 +44,7 @@ void rtl8821ae_dm_bt_reject_ap_aggregated_packet(struct ieee80211_hw *hw, bool bPRX_TS_RECORD pRxTs =NULL ;if (b_reject){ -// Do not allow receiving A-MPDU aggregation. +/* Do not allow receiving A-MPDU aggregation. */ if (rtlpriv->mac80211.vendor ==PEER_CISCO ) {if (pHTInfo->bAcceptAddbaReq) {RTPRINT (FBT ,BT_TRACE , ("BT_Disallow AMPDU \n" ));
Signature · 1 line
2.1.0
PATCH 2/12 Staging: rtl8821ae: hal_bt_coexist: fix coding style issue
Fix coding style issue which requires a space before the open curly brace '{'.
--- drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c +2 -2
@@ -43,7 +43,7 @@ void rtl8821ae_dm_bt_reject_ap_aggregated_packet(struct ieee80211_hw *hw, bool bstruct rtl_priv rtlpriv =rtl_priv (hw);PRX_TS_RECORD pRxTs =NULL ; -if (b_reject){ +if (b_reject) {/* Do not allow receiving A-MPDU aggregation. */ if (rtlpriv->mac80211.vendor ==PEER_CISCO ) {if (pHTInfo->bAcceptAddbaReq) {
@@ -224,7 +224,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_MEDIUM ;if ((rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_LOW ) || - (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_STAY_LOW )){ + (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_STAY_LOW )) {if (undecoratedsmoothed_pwdb >= (rssi_thresh +BT_FW_COEX_THRESH_TOL )) { bt_rssi_state =BT_RSSI_STATE_HIGH ;
Signature · 1 line
2.1.0
PATCH 3/12 Staging: rtl8821ae: hal_bt_coexist: fix coding style issue
In reply to An HaFix coding style issue which requires a space after the open parenthesis '('.
--- .../staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-)
drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c +25 -25
@@ -43,13 +43,13 @@ void rtl8821ae_dm_bt_reject_ap_aggregated_packet(struct ieee80211_hw *hw, bool bstruct rtl_priv rtlpriv =rtl_priv (hw);PRX_TS_RECORD pRxTs =NULL ; -if (b_reject) { +if (b_reject) {/* Do not allow receiving A-MPDU aggregation. */ if (rtlpriv->mac80211.vendor ==PEER_CISCO ) {if (pHTInfo->bAcceptAddbaReq) {RTPRINT (FBT ,BT_TRACE , ("BT_Disallow AMPDU \n" )); pHTInfo->bAcceptAddbaReq = FALSE; -if (GetTs (Adapter, (PTS_COMMON_INFO *)(&pRxTs), pMgntInfo->Bssid,0 ,RX_DIR , FALSE)) +if (GetTs (Adapter, (PTS_COMMON_INFO *)(&pRxTs), pMgntInfo->Bssid,0 ,RX_DIR , FALSE))TsInitDelBA (Adapter, (PTS_COMMON_INFO )pRxTs,RX_DIR ); } }else {
@@ -59,7 +59,7 @@ void rtl8821ae_dm_bt_reject_ap_aggregated_packet(struct ieee80211_hw *hw, bool b } } }else { -if (rtlpriv->mac80211.vendor ==PEER_CISCO ) { +if (rtlpriv->mac80211.vendor ==PEER_CISCO ) {if (!pHTInfo->bAcceptAddbaReq) {RTPRINT (FBT ,BT_TRACE , ("BT_Allow AMPDU \n" )); pHTInfo->bAcceptAddbaReq = TRUE;
@@ -78,13 +78,13 @@ struct rtl_phy *rtlphy = &(rtlpriv->phy);if (rtlpriv->link_info.b_busytraffic) { rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_IDLE ; -if (rtlpriv->link_info.b_tx_busy_traffic) { +if (rtlpriv->link_info.b_tx_busy_traffic) { rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_WIFI_UPLINK ; }else { rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_UPLINK ; } -if (rtlpriv->link_info.b_rx_busy_traffic) { +if (rtlpriv->link_info.b_rx_busy_traffic) { rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_WIFI_DOWNLINK ; }else { rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_DOWNLINK ;
@@ -102,7 +102,7 @@ if (rtlpriv->mac80211.mode == WIRELESS_MODE_G rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_HT40 ; }else { rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_LEGACY ; -if (rtlphy->current_chan_bw ==HT_CHANNEL_WIDTH_20_40 ) { +if (rtlphy->current_chan_bw ==HT_CHANNEL_WIDTH_20_40 ) { rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_WIFI_HT40 ; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_HT20 ; }else {
@@ -130,12 +130,12 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw, undecoratedsmoothed_pwdb =rtl8821ae_dm_bt_get_rx_ss (hw); -if (level_num ==2 ) { +if (level_num ==2 ) { rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_MEDIUM ; -if ( (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_LOW ) || +if ( (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_LOW ) || (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_STAY_LOW )) { -if (undecoratedsmoothed_pwdb >= (rssi_thresh +BT_FW_COEX_THRESH_TOL )) { +if (undecoratedsmoothed_pwdb >= (rssi_thresh +BT_FW_COEX_THRESH_TOL )) { bt_rssi_state =BT_RSSI_STATE_HIGH ; rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_WIFI_RSSI_1_HIGH ; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_LOW ;
@@ -145,7 +145,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[DM][BT], RSSI_1 state stay at Low\n" )); } }else { -if (undecoratedsmoothed_pwdb < rssi_thresh) { +if (undecoratedsmoothed_pwdb < rssi_thresh) { bt_rssi_state =BT_RSSI_STATE_LOW ; rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_WIFI_RSSI_1_LOW ; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_HIGH ;
@@ -155,15 +155,15 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[DM][BT], RSSI_1 state stay at High\n" )); } } - }else if (level_num ==3 ) { -if (rssi_thresh > rssi_thresh1) { + }else if (level_num ==3 ) { +if (rssi_thresh > rssi_thresh1) {RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[DM][BT], RSSI_1 thresh error!!\n" ));return rtlpcipriv->btcoexist.bt_pre_rssi_state; } -if ( (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_LOW ) || +if ( (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_LOW ) || (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_STAY_LOW )) { -if (undecoratedsmoothed_pwdb >= (rssi_thresh+BT_FW_COEX_THRESH_TOL )) { +if (undecoratedsmoothed_pwdb >= (rssi_thresh+BT_FW_COEX_THRESH_TOL )) { bt_rssi_state =BT_RSSI_STATE_MEDIUM ; rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_WIFI_RSSI_1_MEDIUM ; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_LOW ;
@@ -173,15 +173,15 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw, bt_rssi_state =BT_RSSI_STATE_STAY_LOW ;RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[DM][BT], RSSI_1 state stay at Low\n" )); } - }else if ( (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_MEDIUM ) || + }else if ( (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_MEDIUM ) || (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_STAY_MEDIUM )) { -if (undecoratedsmoothed_pwdb >= (rssi_thresh1 +BT_FW_COEX_THRESH_TOL )) { +if (undecoratedsmoothed_pwdb >= (rssi_thresh1 +BT_FW_COEX_THRESH_TOL )) { bt_rssi_state =BT_RSSI_STATE_HIGH ; rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_WIFI_RSSI_1_HIGH ; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_LOW ; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_MEDIUM ;RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[DM][BT], RSSI_1 state switch to High\n" )); - }else if (undecoratedsmoothed_pwdb < rssi_thresh) { + }else if (undecoratedsmoothed_pwdb < rssi_thresh) { bt_rssi_state =BT_RSSI_STATE_LOW ; rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_WIFI_RSSI_1_LOW ; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_HIGH ;
@@ -192,7 +192,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[DM][BT], RSSI_1 state stay at Medium\n" )); } }else { -if (undecoratedsmoothed_pwdb < rssi_thresh1) { +if (undecoratedsmoothed_pwdb < rssi_thresh1) { bt_rssi_state =BT_RSSI_STATE_MEDIUM ; rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_WIFI_RSSI_1_MEDIUM ; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_HIGH ;
@@ -263,7 +263,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, }if ((rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_LOW ) || (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_STAY_LOW )) { -if (undecoratedsmoothed_pwdb +if (undecoratedsmoothed_pwdb >= (rssi_thresh +BT_FW_COEX_THRESH_TOL )) { bt_rssi_state =BT_RSSI_STATE_MEDIUM ; rtlpcipriv->btcoexist.current_state
@@ -292,7 +292,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, &= ~BT_COEX_STATE_WIFI_RSSI_MEDIUM;RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[DM][BT], RSSI state switch to High\n" )); - }else if (undecoratedsmoothed_pwdb < rssi_thresh) + }else if (undecoratedsmoothed_pwdb < rssi_thresh) { bt_rssi_state =BT_RSSI_STATE_LOW ; rtlpcipriv->btcoexist.current_state
@@ -309,7 +309,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, ("[DM][BT], RSSI state stay at Medium\n")); } }else { -if (undecoratedsmoothed_pwdb < rssi_thresh1) { +if (undecoratedsmoothed_pwdb < rssi_thresh1) { bt_rssi_state =BT_RSSI_STATE_MEDIUM ; rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_WIFI_RSSI_MEDIUM ;
@@ -443,7 +443,7 @@ void rtl8821ae_dm_bt_fw_coex_all_off(struct ieee80211_hw *hw)RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("rtl8821ae_dm_bt_fw_coex_all_off()\n" )); -if (rtlpcipriv->btcoexist.b_fw_coexist_all_off) +if (rtlpcipriv->btcoexist.b_fw_coexist_all_off)return ; RT_TRACE(COMP_BT_COEXIST, DBG_TRACE,
@@ -460,7 +460,7 @@ void rtl8821ae_dm_bt_sw_coex_all_off(struct ieee80211_hw *hw)RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("rtl8821ae_dm_bt_sw_coex_all_off()\n" )); -if (rtlpcipriv->btcoexist.b_sw_coexist_all_off) +if (rtlpcipriv->btcoexist.b_sw_coexist_all_off)return ; RT_TRACE(COMP_BT_COEXIST, DBG_TRACE,
@@ -477,7 +477,7 @@ void rtl8821ae_dm_bt_hw_coex_all_off(struct ieee80211_hw *hw)RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("rtl8821ae_dm_bt_hw_coex_all_off()\n" )); -if (rtlpcipriv->btcoexist.b_hw_coexist_all_off) +if (rtlpcipriv->btcoexist.b_hw_coexist_all_off)return ;RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("rtl8821ae_dm_bt_hw_coex_all_off(), real Do\n" ));
@@ -498,7 +498,7 @@ bool rtl8821ae_dm_bt_is_coexist_state_changed(struct ieee80211_hw *hw) {struct rtl_pci_priv *rtlpcipriv =rtl_pcipriv (hw); -if ((rtlpcipriv->btcoexist.previous_state +if ((rtlpcipriv->btcoexist.previous_state == rtlpcipriv->btcoexist.current_state) && (rtlpcipriv->btcoexist.previous_state_h == rtlpcipriv->btcoexist.current_state_h))
Signature · 1 line
2.1.0
PATCH 4/12 Staging: rtl8821ae: hal_bt_coexist: fix coding style issue
In reply to An HaFix coding style issue which requires a space after a comma.
--- .../staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c +13 -13
@@ -197,7 +197,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw, rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_WIFI_RSSI_1_MEDIUM ; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_HIGH ; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_LOW ; -RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE ,("[DM][BT], RSSI_1 state switch to Medium\n" )); +RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[DM][BT], RSSI_1 state switch to Medium\n" )); }else { bt_rssi_state =BT_RSSI_STATE_STAY_HIGH ;RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[DM][BT], RSSI_1 state stay at High\n" ));
@@ -382,11 +382,11 @@ void rtl8821ae_dm_bt_agc_table(struct ieee80211_hw *hw, u8 type)if (type ==BT_AGCTABLE_OFF ) {RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[BT]AGCTable Off!\n" )); -rtl_write_dword (rtlpriv,0xc78 ,0x641c0001 ); -rtl_write_dword (rtlpriv,0xc78 ,0x631d0001 ); -rtl_write_dword (rtlpriv,0xc78 ,0x621e0001 ); -rtl_write_dword (rtlpriv,0xc78 ,0x611f0001 ); -rtl_write_dword (rtlpriv,0xc78 ,0x60200001 ); +rtl_write_dword (rtlpriv,0xc78 ,0x641c0001 ); +rtl_write_dword (rtlpriv,0xc78 ,0x631d0001 ); +rtl_write_dword (rtlpriv,0xc78 ,0x621e0001 ); +rtl_write_dword (rtlpriv,0xc78 ,0x611f0001 ); +rtl_write_dword (rtlpriv,0xc78 ,0x60200001 );rtl8821ae_phy_set_rf_reg (hw,RF90_PATH_A ,RF_RX_AGC_HP ,0xfffff ,0x32000 );
@@ -400,11 +400,11 @@ void rtl8821ae_dm_bt_agc_table(struct ieee80211_hw *hw, u8 type) RF_RX_G1, 0xfffff, 0x30355); }else if (type ==BT_AGCTABLE_ON ) {RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[BT]AGCTable On!\n" )); -rtl_write_dword (rtlpriv,0xc78 ,0x4e1c0001 ); -rtl_write_dword (rtlpriv,0xc78 ,0x4d1d0001 ); -rtl_write_dword (rtlpriv,0xc78 ,0x4c1e0001 ); -rtl_write_dword (rtlpriv,0xc78 ,0x4b1f0001 ); -rtl_write_dword (rtlpriv,0xc78 ,0x4a200001 ); +rtl_write_dword (rtlpriv,0xc78 ,0x4e1c0001 ); +rtl_write_dword (rtlpriv,0xc78 ,0x4d1d0001 ); +rtl_write_dword (rtlpriv,0xc78 ,0x4c1e0001 ); +rtl_write_dword (rtlpriv,0xc78 ,0x4b1f0001 ); +rtl_write_dword (rtlpriv,0xc78 ,0x4a200001 );rtl8821ae_phy_set_rf_reg (hw,RF90_PATH_A ,RF_RX_AGC_HP ,0xfffff ,0xdc000 );
@@ -428,10 +428,10 @@ void rtl8821ae_dm_bt_bb_back_off_level(struct ieee80211_hw *hw, u8 type)if (type ==BT_BB_BACKOFF_OFF ) {RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[BT]BBBackOffLevel Off!\n" )); -rtl_write_dword (rtlpriv,0xc04 ,0x3a05611 ); +rtl_write_dword (rtlpriv,0xc04 ,0x3a05611 ); }else if (type ==BT_BB_BACKOFF_ON ) {RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[BT]BBBackOffLevel On!\n" )); -rtl_write_dword (rtlpriv,0xc04 ,0x3a07611 ); +rtl_write_dword (rtlpriv,0xc04 ,0x3a07611 ); rtlpcipriv->btcoexist.b_sw_coexist_all_off = false; } }
Signature · 1 line
2.1.0
PATCH 5/12 Staging: rtl8821ae: hal_bt_coexist: fix pointer placement coding style issue
In reply to An HaFix pointer placement coding style issue, where using "foo *" is preferable over "foo*".
--- drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c +1 -1
@@ -49,7 +49,7 @@ void rtl8821ae_dm_bt_reject_ap_aggregated_packet(struct ieee80211_hw *hw, bool bif (pHTInfo->bAcceptAddbaReq) {RTPRINT (FBT ,BT_TRACE , ("BT_Disallow AMPDU \n" )); pHTInfo->bAcceptAddbaReq = FALSE; -if (GetTs (Adapter, (PTS_COMMON_INFO *)(&pRxTs), pMgntInfo->Bssid,0 ,RX_DIR , FALSE)) +if (GetTs (Adapter, (PTS_COMMON_INFO *)(&pRxTs), pMgntInfo->Bssid,0 ,RX_DIR , FALSE))TsInitDelBA (Adapter, (PTS_COMMON_INFO )pRxTs,RX_DIR ); } }else {
Signature · 1 line
2.1.0
PATCH 6/12 Staging: rtl8821ae: hal_bt_coexist: fix coding style issue
In reply to An HaRemove whitespace after open parenthesis '('.
--- drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c +3 -3
@@ -133,7 +133,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,if (level_num ==2 ) { rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_RSSI_1_MEDIUM ; -if ( (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_LOW ) || +if ((rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_LOW ) || (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_STAY_LOW )) {if (undecoratedsmoothed_pwdb >= (rssi_thresh +BT_FW_COEX_THRESH_TOL )) { bt_rssi_state =BT_RSSI_STATE_HIGH ;
@@ -161,7 +161,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,return rtlpcipriv->btcoexist.bt_pre_rssi_state; } -if ( (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_LOW ) || +if ((rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_LOW ) || (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_STAY_LOW )) {if (undecoratedsmoothed_pwdb >= (rssi_thresh+BT_FW_COEX_THRESH_TOL )) { bt_rssi_state =BT_RSSI_STATE_MEDIUM ;
@@ -173,7 +173,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw, bt_rssi_state =BT_RSSI_STATE_STAY_LOW ;RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[DM][BT], RSSI_1 state stay at Low\n" )); } - }else if ( (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_MEDIUM ) || + }else if ((rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_MEDIUM ) || (rtlpcipriv->btcoexist.bt_pre_rssi_state ==BT_RSSI_STATE_STAY_MEDIUM )) {if (undecoratedsmoothed_pwdb >= (rssi_thresh1 +BT_FW_COEX_THRESH_TOL )) { bt_rssi_state =BT_RSSI_STATE_HIGH ;
Signature · 1 line
2.1.0
PATCH 7/12 Staging: rtl8821ae: hal_bt_coexist: fix coding style issue
In reply to An HaRemove unnecessary whitespace before a quoted newline.
--- drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c +2 -2
@@ -47,7 +47,7 @@ void rtl8821ae_dm_bt_reject_ap_aggregated_packet(struct ieee80211_hw *hw, bool b/* Do not allow receiving A-MPDU aggregation. */ if (rtlpriv->mac80211.vendor ==PEER_CISCO ) {if (pHTInfo->bAcceptAddbaReq) { -RTPRINT (FBT ,BT_TRACE , ("BT_Disallow AMPDU \n" )); +RTPRINT (FBT ,BT_TRACE , ("BT_Disallow AMPDU\n" )); pHTInfo->bAcceptAddbaReq = FALSE;if (GetTs (Adapter, (PTS_COMMON_INFO *)(&pRxTs), pMgntInfo->Bssid,0 ,RX_DIR , FALSE))TsInitDelBA (Adapter, (PTS_COMMON_INFO )pRxTs,RX_DIR );
@@ -61,7 +61,7 @@ void rtl8821ae_dm_bt_reject_ap_aggregated_packet(struct ieee80211_hw *hw, bool b }else {if (rtlpriv->mac80211.vendor ==PEER_CISCO ) {if (!pHTInfo->bAcceptAddbaReq) { -RTPRINT (FBT ,BT_TRACE , ("BT_Allow AMPDU \n" )); +RTPRINT (FBT ,BT_TRACE , ("BT_Allow AMPDU\n" )); pHTInfo->bAcceptAddbaReq = TRUE; } }
Signature · 1 line
2.1.0
PATCH 8/12 Staging: rtl8821ae: hal_bt_coexist: fix coding style issue
In reply to An HaFix coding style issue where the if statement unnecessarily uses curly braces for one line statements.
--- drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c +6 -9
@@ -78,17 +78,15 @@ struct rtl_phy *rtlphy = &(rtlpriv->phy);if (rtlpriv->link_info.b_busytraffic) { rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_IDLE ; -if (rtlpriv->link_info.b_tx_busy_traffic) { +if (rtlpriv->link_info.b_tx_busy_traffic) rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_WIFI_UPLINK ; - }else { +else rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_UPLINK ; - } -if (rtlpriv->link_info.b_rx_busy_traffic) { +if (rtlpriv->link_info.b_rx_busy_traffic) rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_WIFI_DOWNLINK ; - }else { +else rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_DOWNLINK ; - } }else { rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_WIFI_IDLE ; rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_WIFI_UPLINK ;
@@ -111,12 +109,11 @@ if (rtlpriv->mac80211.mode == WIRELESS_MODE_G } } -if (bt_operation_on) { +if (bt_operation_on) rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_BT30 ; -}else { +else rtlpcipriv->btcoexist.current_state &= ~BT_COEX_STATE_BT30 ; } -} u8 rtl8821ae_dm_bt_check_coex_rssi_state1(struct ieee80211_hw *hw,
Signature · 1 line
2.1.0
PATCH 9/12 Staging: rtl8821ae: hal_bt_coexist: fix coding style issue
In reply to An HaFix coding style issue where the else conditional statement should follow the closing curly brace '}'.
--- drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c +1 -2
@@ -251,8 +251,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, ("[DM][BT], RSSI state stay at High\n")); } } - } -else if (level_num ==3 ) { + }else if (level_num ==3 ) {if (rssi_thresh > rssi_thresh1) {RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[DM][BT], RSSI thresh error!!\n" ));
Signature · 1 line
2.1.0
PATCH 10/12 Staging: rtl8821ae: hal_bt_coexist: fix coding style issue
In reply to An HaFix coding style issue where the open curly brace '{' should be on the same line as the if statement.
--- drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c +1 -2
@@ -288,8 +288,7 @@ u8 rtl8821ae_dm_bt_check_coex_rssi_state(struct ieee80211_hw *hw, &= ~BT_COEX_STATE_WIFI_RSSI_MEDIUM;RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("[DM][BT], RSSI state switch to High\n" )); - }else if (undecoratedsmoothed_pwdb < rssi_thresh) - { + }else if (undecoratedsmoothed_pwdb < rssi_thresh) { bt_rssi_state =BT_RSSI_STATE_LOW ; rtlpcipriv->btcoexist.current_state |=BT_COEX_STATE_WIFI_RSSI_LOW ;
Signature · 1 line
2.1.0
PATCH 11/12 Staging: rtl8821ae: hal_bt_coexist: fix coding style issue
In reply to An HaFix coding style issue which requires a space after the equal sign '='.
--- drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c +1 -1
@@ -347,7 +347,7 @@ void rtl8821ae_dm_bt_balance(struct ieee80211_hw *hw, {struct rtl_pci_priv *rtlpcipriv =rtl_pcipriv (hw);struct rtl_priv *rtlpriv =rtl_priv (hw); -u8 h2c_parameter[3 ] ={0 }; +u8 h2c_parameter[3 ] = {0 };if (b_balance_on) { h2c_parameter[2 ] =1 ;
Signature · 1 line
2.1.0
PATCH 12/12 Staging: rtl8821ae: hal_bt_coexist: fix coding style issue
In reply to An HaFix coding style issue which requires a blank line after declarations.
--- drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.c +1 -0
@@ -435,6 +435,7 @@ void rtl8821ae_dm_bt_fw_coex_all_off(struct ieee80211_hw *hw) {struct rtl_pci_priv *rtlpcipriv =rtl_pcipriv (hw);struct rtl_priv *rtlpriv =rtl_priv (hw); +RT_TRACE (COMP_BT_COEXIST ,DBG_TRACE , ("rtl8821ae_dm_bt_fw_coex_all_off()\n" ));
Signature · 1 line
2.1.0
Hm... Now you've broken it into *too* many separate patches. Also the subjects are the same. Also the subjects are too vague. Which coding style issue is addressed?
It should be something like:
patch 1: comments
patch 2: add/remove spaces
patch 3: fix quoted text
patch 4: braces
patch 5: add a blank line
regards,
dan carpenter
I see, thanks, I will fix it, I was just worried about the subjects being too long so I just stuck with the same subject; is there a character limit on how long the subject line should be? Or as long as it's reasonable, it'll be fine?
Quoted 14 lines · Dan Carpenter
Hm... Now you've broken it into *too* many separate patches. Also the subjects are the same. Also the subjects are too vague. Which coding style issue is addressed?
It should be something like:
patch 1: comments
patch 2: add/remove spaces
patch 3: fix quoted text
patch 4: braces
patch 5: add a blank lineregards,
dan carpenter
Quoted 4 lines · An Tuan Ha
I see, thanks, I will fix it, I was just worried about the subjects being too long so I just stuck with the same subject; is there a character limit on how long the subject line should be? Or as long as it's reasonable, it'll be fine?
Reasonable is fine.
regards,
dan carpenter