From patchwork Sun Oct 26 16:18:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Mcquade X-Patchwork-Id: 5155051 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 71BA09F349 for ; Sun, 26 Oct 2014 16:19:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 980D6202F8 for ; Sun, 26 Oct 2014 16:19:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ACABF20212 for ; Sun, 26 Oct 2014 16:19:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751625AbaJZQS7 (ORCPT ); Sun, 26 Oct 2014 12:18:59 -0400 Received: from mail-wg0-f41.google.com ([74.125.82.41]:51546 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751593AbaJZQS6 (ORCPT ); Sun, 26 Oct 2014 12:18:58 -0400 Received: by mail-wg0-f41.google.com with SMTP id b13so4088138wgh.12 for ; Sun, 26 Oct 2014 09:18:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=EU14MaxECK7RIMpbAkOYT/30Vyd95fYSQw7JQ8N+f+0=; b=XYvPqDOwL8stuvapgq1+AvnNPKk7JH5oJpbJtvWxwXJxUSGd51L57RxfvoZuiCWWH0 bn+PCe2HDjuDCbulnaA12T3NKp+nU6HU2My8fbNZzrE2E4wUZ73qrOvh3kg/+OXlaswf sABDWDqf99rGTMbivFLuITysAeNGhDPUxzZ0Thcwrelp05Mx1MRz7vVOoj+POxwKnYFM lH2sT1oA2jRji8YAOqvZ+PS3bvw8rMRFx67XMxGAG52FxscaF0OTx8EIMiOlZVdpHp4s 0+9kG9eBGVRSbufZeBfUW/DbMKwsUBsAfiM4gN/RMtkRtCMv5ML4wFdNSg8ruWVpn8hO td1g== X-Received: by 10.180.104.105 with SMTP id gd9mr15788279wib.65.1414340336967; Sun, 26 Oct 2014 09:18:56 -0700 (PDT) Received: from paul87-SATELLITE-L850D-12P.Home ([78.18.70.101]) by mx.google.com with ESMTPSA id pn4sm12476284wjc.38.2014.10.26.09.18.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Oct 2014 09:18:56 -0700 (PDT) From: Paul McQuade To: paulmcquad@gmail.com Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org, gregkh@linuxfoundation.org, Jes.Sorensen@redhat.com, Larry.Finger@lwfinger.net Subject: [PATCH 2/2] staging: rtl8723au:core Date: Sun, 26 Oct 2014 16:18:52 +0000 Message-Id: <1414340332-4556-1-git-send-email-paulmcquad@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ERROR: spaces required around that ':' (ctx:VxE) Signed-off-by: Paul McQuade --- drivers/staging/rtl8723au/core/rtw_ieee80211.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723au/core/rtw_ieee80211.c b/drivers/staging/rtl8723au/core/rtw_ieee80211.c index 6274cb3..41006cf 100644 --- a/drivers/staging/rtl8723au/core/rtw_ieee80211.c +++ b/drivers/staging/rtl8723au/core/rtw_ieee80211.c @@ -794,28 +794,28 @@ u16 rtw_mcs_rate23a(u8 rf_type, u8 bw_40MHz, u8 short_GI_20, u8 short_GI_40, if (rf_type == RF_1T1R) { if (mcs->rx_mask[0] & BIT(7)) - max_rate = (bw_40MHz) ? ((short_GI_40)?1500:1350): + max_rate = (bw_40MHz) ? ((short_GI_40)?1500:1350) : ((short_GI_20)?722:650); else if (mcs->rx_mask[0] & BIT(6)) - max_rate = (bw_40MHz) ? ((short_GI_40)?1350:1215): + max_rate = (bw_40MHz) ? ((short_GI_40)?1350:1215) : ((short_GI_20)?650:585); else if (mcs->rx_mask[0] & BIT(5)) - max_rate = (bw_40MHz) ? ((short_GI_40)?1200:1080): + max_rate = (bw_40MHz) ? ((short_GI_40)?1200:1080) : ((short_GI_20)?578:520); else if (mcs->rx_mask[0] & BIT(4)) - max_rate = (bw_40MHz) ? ((short_GI_40)?900:810): + max_rate = (bw_40MHz) ? ((short_GI_40)?900:810) : ((short_GI_20)?433:390); else if (mcs->rx_mask[0] & BIT(3)) - max_rate = (bw_40MHz) ? ((short_GI_40)?600:540): + max_rate = (bw_40MHz) ? ((short_GI_40)?600:540) : ((short_GI_20)?289:260); else if (mcs->rx_mask[0] & BIT(2)) - max_rate = (bw_40MHz) ? ((short_GI_40)?450:405): + max_rate = (bw_40MHz) ? ((short_GI_40)?450:405) : ((short_GI_20)?217:195); else if (mcs->rx_mask[0] & BIT(1)) - max_rate = (bw_40MHz) ? ((short_GI_40)?300:270): + max_rate = (bw_40MHz) ? ((short_GI_40)?300:270) : ((short_GI_20)?144:130); else if (mcs->rx_mask[0] & BIT(0)) - max_rate = (bw_40MHz) ? ((short_GI_40)?150:135): + max_rate = (bw_40MHz) ? ((short_GI_40)?150:135) : ((short_GI_20)?72:65); } else { if (mcs->rx_mask[1]) {