>From aa0f4ae8c325545b1fd794d6bbf8c4d2f64e2ec2 Mon Sep 17 00:00:00 2001 From: Kien Ha <kienha9922@xxxxxxxxx> Date: Fri, 27 Oct 2017 14:07:55 -0400 Subject: [PATCH v2] staging: rtlwifi: Fix line too long warning Made nested if else statement more concise to help conform to coding style. Signed-off-by: Kien Ha <kienha9922@xxxxxxxxx> --- Changes in v2: - Improve block of code to be more concise drivers/staging/rtlwifi/base.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/staging/rtlwifi/base.c b/drivers/staging/rtlwifi/base.c index b88b0e8edd3d..fdd1ab1e38c5 100644 --- a/drivers/staging/rtlwifi/base.c +++ b/drivers/staging/rtlwifi/base.c @@ -1273,23 +1273,14 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw, * 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]; - } - } - } + tcb_desc->hw_rate = + sta && sta->vht_cap.vht_supported ? + rtl_get_vht_highest_n_rate(hw, sta) : + sta && sta->ht_cap.ht_supported ? + _rtl_get_highest_n_rate(hw, sta) : + rtlmac->mode == WIRELESS_MODE_B ? + rtlpriv->cfg->maps[RTL_RC_CCK_RATE11M] : + rtlpriv->cfg->maps[RTL_RC_OFDM_RATE54M]; } if (is_multicast_ether_addr(hdr->addr1)) -- 2.14.3 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel