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 C837EC28CBC for ; Sun, 3 May 2020 13:29:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9D12720752 for ; Sun, 3 May 2020 13:29:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kocurkovo.cz header.i=@kocurkovo.cz header.b="aF0OMyfi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728656AbgECN3c (ORCPT ); Sun, 3 May 2020 09:29:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728631AbgECN3a (ORCPT ); Sun, 3 May 2020 09:29:30 -0400 Received: from mail.kocurkovo.cz (unknown [IPv6:2a02:2b88:2:1::5b29:1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5435EC061A0F for ; Sun, 3 May 2020 06:29:30 -0700 (PDT) Received: by mail.kocurkovo.cz (Postfix, from userid 1000) id 25FD218FF; Sun, 3 May 2020 15:29:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.kocurkovo.cz 25FD218FF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kocurkovo.cz; s=mail; t=1588512564; bh=AFyRxD9BU6cVNLrSCjghBgVzm+iB1gkng47LzmGhZ2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aF0OMyfikviv7C/CjIl/pHTSTAh4q6oI/7BtlSyDP+ioQ/Okz3Fm8qPu3c+ilbzrT KOanTkmi/PLdQG+bkjoI9JSbJ0wimAu5qOK2vV88uehlJbymZeMj3p2XDPG5sVNywJ +KzTEaaQjYSJVM5c0T/NEWe/JJ4ZnygZ42jtiWeQ= 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 1/5] staging: vt6655: merge two switch cases in s_uGetDataDuration Date: Sun, 3 May 2020 15:29:08 +0200 Message-Id: <1588512552-12297-2-git-send-email-mdujava@kocurkovo.cz> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588512552-12297-1-git-send-email-mdujava@kocurkovo.cz> References: <1588512552-12297-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 reuse code for two cases. Signed-off-by: Matej Dujava --- drivers/staging/vt6655/rxtx.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 2f9c2ead3cb8..28f0cda36dec 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -296,40 +296,6 @@ s_uGetDataDuration( break; case DATADUR_A_F0: /* DATADUR_A_F0 */ - if (((uMACfragNum == 1)) || bLastFrag) {/* Non Frag or Last Frag */ - if (bNeedAck) { - uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate); - return pDevice->uSIFS + uAckTime; - } else { - return 0; - } - } else { /* First Frag or Mid Frag */ - if (wRate < RATE_18M) - wRate = RATE_18M; - else if (wRate > RATE_54M) - wRate = RATE_54M; - - if (byFBOption == AUTO_FB_0) { - uNextPktTime = s_uGetTxRsvTime(pDevice, - byPktType, len, - wFB_Opt0[FB_RATE0][wRate - RATE_18M], - bNeedAck); - } else { - uNextPktTime = s_uGetTxRsvTime(pDevice, - byPktType, len, - wFB_Opt1[FB_RATE0][wRate - RATE_18M], - bNeedAck); - } - - if (bNeedAck) { - uAckTime = bb_get_frame_time(pDevice->byPreambleType, - byPktType, 14, - pDevice->byTopOFDMBasicRate); - } - return pDevice->uSIFS + uAckTime + uNextPktTime; - } - break; - case DATADUR_A_F1: /* DATADUR_A_F1 */ if (((uMACfragNum == 1)) || bLastFrag) { /* Non Frag or Last Frag */ if (bNeedAck) { -- 2.26.2