From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FA23C47256 for ; Sun, 3 May 2020 15:43:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F23D620836 for ; Sun, 3 May 2020 15:43:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kocurkovo.cz header.i=@kocurkovo.cz header.b="GCtrceY1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728912AbgECPnU (ORCPT ); Sun, 3 May 2020 11:43:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728880AbgECPnS (ORCPT ); Sun, 3 May 2020 11:43:18 -0400 Received: from mail.kocurkovo.cz (unknown [IPv6:2a02:2b88:2:1::5b29:1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84368C061A0F for ; Sun, 3 May 2020 08:43:17 -0700 (PDT) Received: by mail.kocurkovo.cz (Postfix, from userid 1000) id 39E3518CB; Sun, 3 May 2020 17:43:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.kocurkovo.cz 39E3518CB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kocurkovo.cz; s=mail; t=1588520594; bh=D1yVzfofhzgl2jyS+MzwMI9d59GdyX9BHALuoik3STQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GCtrceY1uU/zJzU2l0nYB8IVqA3K3jE/gVDpH2NmmwIW5tpGbocbDJdKvtmtySCoi 4hh2EsYD9Rr4D+2zMm2yOH0MKP3BkUwjp6ZNb0p6pJtpRiHLyb/h9awnCwdCmGbf83 vBCN2/xSvo5G+8DBkzMZKZrVG9Vvo6vvZ3wiTIXE= From: Matej Dujava To: Forest Bond , Greg Kroah-Hartman , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Cc: Stefano Brivio , Briana Oursler , "Frank A. Cancio Bello" , Matej Dujava Subject: [PATCH v2 1/2] staging: vt6655: return early if not bNeedAck Date: Sun, 3 May 2020 17:42:49 +0200 Message-Id: <1588520570-14388-2-git-send-email-mdujava@kocurkovo.cz> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588520570-14388-1-git-send-email-mdujava@kocurkovo.cz> References: <1588520570-14388-1-git-send-email-mdujava@kocurkovo.cz> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch will check for bNeedAck before making bb_get_frame_time call, so in case we dont need uAckTime, we can return early. Signed-off-by: Matej Dujava --- drivers/staging/vt6655/rxtx.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 2f9c2ead3cb8..dda578436e64 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -166,15 +166,16 @@ s_uGetTxRsvTime( unsigned int uDataTime, uAckTime; uDataTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, cbFrameLength, wRate); + + if (!bNeedAck) + return uDataTime; + if (byPktType == PK_TYPE_11B) /* llb,CCK mode */ uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopCCKBasicRate); else /* 11g 2.4G OFDM mode & 11a 5G OFDM mode */ uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopOFDMBasicRate); - if (bNeedAck) - return uDataTime + pDevice->uSIFS + uAckTime; - else - return uDataTime; + return uDataTime + pDevice->uSIFS + uAckTime; } static __le16 vnt_rxtx_rsvtime_le16(struct vnt_private *priv, u8 pkt_type, -- 2.26.2