staging: rtlwifi: refactor rtl_get_tcb_desc
PATCH v2 1/1 staging: rtlwifi: refactor rtl_get_tcb_desc
Refactored rtl_get_tcb_desc slightly to stay within the 80 character line limit.
Signed-off-by Luke Triantafyllidis <[email protected]>
---
Changes in v2:
- Fixed the formatting of the comments
- Unwrapped some of the lines that were originally wrapped over multiple lines to stay within the 80 character limit
Note:
- I didn't CC the first version of this patch to a public mailing list, so if you're not Greg KH, you probably want to look at this in its entirety
drivers/staging/rtlwifi/base.c | 102 +++++++++++++++++++--------------------- 1 files changed, 48 insertions(+), 54 deletions(-)
drivers/staging/rtlwifi/base.c +48 -54
@@ -1237,67 +1237,61 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw,if (rtl_is_tx_report_skb (hw, skb)) tcb_desc->use_spe_rpt =1 ; -if (ieee80211_is_data (fc)) { -/* -*we set data rate INX 0 -*in rtl_rc.c if skb is special data or -*mgt which need low data rate. -*/ - -/* -*So tcb_desc->hw_rate is just used for -*special data and mgt frames -*/ -if (info->control.rates[0 ].idx ==0 || -ieee80211_is_nullfunc (fc)) { - tcb_desc->use_driver_rate = true; - tcb_desc->ratr_index = -SET_RATE_ID (RATR_INX_WIRELESS_MC ); +if (!ieee80211_is_data (fc)) { + tcb_desc->use_driver_rate = true; + tcb_desc->ratr_index =SET_RATE_ID (RATR_INX_WIRELESS_MC ); + tcb_desc->disable_ratefallback =1 ; + tcb_desc->mac_id =0 ; + tcb_desc->packet_bw = false; - tcb_desc->disable_ratefallback =1 ; - }else { -/* because hw will never use hw_rate -* when tcb_desc->use_driver_rate = false -* so we never set highest N rate here, -* and N rate will all be controlled by FW -* when tcb_desc->use_driver_rate = false -*/ -if (sta && sta->vht_cap.vht_supported) { - tcb_desc->hw_rate = -_rtl_get_vht_highest_n_rate (hw, sta); - }else { -if (sta && sta->ht_cap.ht_supported) { - tcb_desc->hw_rate = -_rtl_get_highest_n_rate (hw, sta); - }else { -if (rtlmac->mode ==WIRELESS_MODE_B ) { - tcb_desc->hw_rate = - rtlpriv->cfg->maps[RTL_RC_CCK_RATE11M ]; - }else { - tcb_desc->hw_rate = - rtlpriv->cfg->maps[RTL_RC_OFDM_RATE54M ]; - } - } - } - } +return ; + } -if (is_multicast_ether_addr (hdr->addr1)) - tcb_desc->multicast =1 ; -else if (is_broadcast_ether_addr (hdr->addr1)) - tcb_desc->broadcast =1 ; +/* +* We set data rate INX 0 +* in rtl_rc.c if skb is special data or +* mgt which need low data rate. +*/ -_rtl_txrate_selectmode (hw, sta, tcb_desc); -_rtl_query_bandwidth_mode (hw, sta, tcb_desc); -_rtl_qurey_shortpreamble_mode (hw, tcb_desc, info); -_rtl_query_shortgi (hw, sta, tcb_desc, info); -_rtl_query_protection_mode (hw, tcb_desc, info); - }else { +/* +* So tcb_desc->hw_rate is just used for +* special data and mgt frames +*/ +if (info->control.rates[0 ].idx ==0 ||ieee80211_is_nullfunc (fc)) { tcb_desc->use_driver_rate = true; tcb_desc->ratr_index =SET_RATE_ID (RATR_INX_WIRELESS_MC ); + tcb_desc->disable_ratefallback =1 ; - tcb_desc->mac_id =0 ; - tcb_desc->packet_bw = false; + }else if (sta && sta->vht_cap.vht_supported) { +/* +* Because hw will never use hw_rate +* when tcb_desc->use_driver_rate = false +* so we never set highest N rate here, +* and N rate will all be controlled by FW +* when tcb_desc->use_driver_rate = false +*/ + tcb_desc->hw_rate =_rtl_get_vht_highest_n_rate (hw, sta); + }else if (sta && sta->ht_cap.ht_supported) { + tcb_desc->hw_rate =_rtl_get_highest_n_rate (hw, sta); + }else { +enum rtl_var_map var =RTL_RC_OFDM_RATE54M ; + +if (rtlmac->mode ==WIRELESS_MODE_B ) + var =RTL_RC_CCK_RATE11M ; + + tcb_desc->hw_rate = rtlpriv->cfg->maps[var]; } + +if (is_multicast_ether_addr (hdr->addr1)) + tcb_desc->multicast =1 ; +else if (is_broadcast_ether_addr (hdr->addr1)) + tcb_desc->broadcast =1 ; + +_rtl_txrate_selectmode (hw, sta, tcb_desc); +_rtl_query_bandwidth_mode (hw, sta, tcb_desc); +_rtl_qurey_shortpreamble_mode (hw, tcb_desc, info); +_rtl_query_shortgi (hw, sta, tcb_desc, info); +_rtl_query_protection_mode (hw, tcb_desc, info);#undef SET_RATE_ID }
Signature · 1 line
1.7.1