From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751550AbdJ2RNE (ORCPT ); Sun, 29 Oct 2017 13:13:04 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:53132 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750978AbdJ2RND (ORCPT ); Sun, 29 Oct 2017 13:13:03 -0400 X-Google-Smtp-Source: ABhQp+StE5jLF4eZYR3uSAfBqXRRWndTf6oVJUtiUkX3l92HZEpTjJOpd1NkElVDOoRPxtdXKz11nw== Message-ID: <1509297176.4894.4.camel@gmail.com> Subject: [PATCH v2] Fix line too long warning From: Kien Ha To: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org Date: Sun, 29 Oct 2017 13:12:56 -0400 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.26.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >>From dbe17bd47c0e76372a5ca391543dc15ddb35c9dd Mon Sep 17 00:00:00 2001 From: Kien Ha Date: Fri, 27 Oct 2017 14:07:55 -0400 Subject: [PATCH v2] Fix line too long warning Signed-off-by: Kien Ha --- 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