From nobody Fri Jun 19 08:29:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B596BC433FE for ; Wed, 6 Apr 2022 09:36:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1456634AbiDFJiD (ORCPT ); Wed, 6 Apr 2022 05:38:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1572986AbiDFJe5 (ORCPT ); Wed, 6 Apr 2022 05:34:57 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E89062A13 for ; Tue, 5 Apr 2022 23:19:14 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id k23so2124951ejd.3 for ; Tue, 05 Apr 2022 23:19:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m27zJUa0hUUwtRXnhRp6D7XxaujvdIa/9+L7Kmi7OFw=; b=BPH9+Z3kr7zvAWWA4yfUUO3TcJNju39QUV/9+CoH/guctJPX6fRcgRAdhqT4i9Jr8Z NFd4TtLX+Z+8MoqjjeCN3efaw97bob0mGVrO+DX+/YOrHM4h1BBsjEZtJ1PDebrQMKjZ yJoQ8jBuh5xAjgPjL+DDHhiU9BO3sm4yF3/oDroYGMXvxgpE6GRa5KdnDZFOlS1rbDr8 Ne++IpU9YzJXZzRWULu2sTdINW3kBmh391dxh7BPrinY7IwhjyZrkMnp5VQMsekIc6/U 2sNlWx0D0vM76lqC7xZuVCaGIw35UGXzv1VwoAPCYXzdUDK1w+tVpFEsKm9yhvCOtdkl L/Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m27zJUa0hUUwtRXnhRp6D7XxaujvdIa/9+L7Kmi7OFw=; b=ZGq+Ar5PviHnWEkeTyKDz3RGHgpquuX8L6iTwih+tvTN0DKMxzB+RDbPi+OLqtFDDv ohW8nKXi4RbEUQGGbjA4VUGYp62pvosYxUMcKdO26cHdZ4T6HnMRMZCbfZtpO+N1ZDG3 JC695gxq5+gZHmIi87Y3rYJ/0UcwUsGDsPGmtH0bC098ywOL7DTEbyEWXSpRgPPfcCLp jHlh8Zl40DLeD1f7eTZYwiakGvaRFPlYdSdtUuB7F89QssPMWcBXGsXpRHb46amSz9Nl gms/tu8Gql/oBsvP2WvoKEyAtFCLHRtM/ZQNWg81tQ3Jok21ZwXhKHmO8UPS845PfQYB SKyw== X-Gm-Message-State: AOAM531IeMgxG6hpqFvmIEzMw7qQ2EmZNq6T20X+X9jRjlyCRYIjDM6c 3G5KZ0LjktJEZp1CxDkdYhk= X-Google-Smtp-Source: ABdhPJzbVQ8/OwGlOVZ3+2MKzr8wTDXkN5t0bdWEb8X9/9VaHHvUAu6voeu4k67V9vFVF0LTTaMf5A== X-Received: by 2002:a17:907:8a1c:b0:6df:ecd6:b6ea with SMTP id sc28-20020a1709078a1c00b006dfecd6b6eamr6745695ejc.530.1649225952609; Tue, 05 Apr 2022 23:19:12 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id q3-20020a50da83000000b0041cdd6e92b1sm2475251edj.27.2022.04.05.23.19.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 23:19:12 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 1/5] staging: r8188eu: use round_up() instead of RND4() Date: Wed, 6 Apr 2022 08:18:55 +0200 Message-Id: <20220406061859.9011-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406061859.9011-1-straube.linux@gmail.com> References: <20220406061859.9011-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use in-kernel round_up() instead of custom RND4(). Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_security.c | 6 +++--- drivers/staging/r8188eu/core/rtw_xmit.c | 4 ++-- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 2 +- drivers/staging/r8188eu/include/osdep_service.h | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_security.c b/drivers/staging/= r8188eu/core/rtw_security.c index 2cdcdfd5ca5c..7462eaab8d2e 100644 --- a/drivers/staging/r8188eu/core/rtw_security.c +++ b/drivers/staging/r8188eu/core/rtw_security.c @@ -63,7 +63,7 @@ void rtw_wep_encrypt(struct adapter *padapter, struct xmi= t_frame *pxmitframe) arc4_crypt(ctx, payload + length, crc.f1, 4); =20 pframe +=3D pxmitpriv->frag_len; - pframe =3D (u8 *)RND4((size_t)(pframe)); + pframe =3D (u8 *)round_up((size_t)pframe, 4); } } } @@ -504,7 +504,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, struct x= mit_frame *pxmitframe) arc4_crypt(ctx, payload + length, crc.f1, 4); =20 pframe +=3D pxmitpriv->frag_len; - pframe =3D (u8 *)RND4((size_t)(pframe)); + pframe =3D (u8 *)round_up((size_t)pframe, 4); } } } else { @@ -1133,7 +1133,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, struct = xmit_frame *pxmitframe) =20 aes_cipher(prwskey, pattrib->hdrlen, pframe, length); pframe +=3D pxmitpriv->frag_len; - pframe =3D (u8 *)RND4((size_t)(pframe)); + pframe =3D (u8 *)round_up((size_t)pframe, 4); } } } else { diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index aede8ef8b098..0f84d9ade0a3 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -642,7 +642,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, s= truct xmit_frame *pxmitfr payload =3D pframe; =20 for (curfragnum =3D 0; curfragnum < pattrib->nr_frags; curfragnum++) { - payload =3D (u8 *)RND4((size_t)(payload)); + payload =3D (u8 *)round_up((size_t)payload, 4); =20 payload =3D payload + pattrib->hdrlen + pattrib->iv_len; if ((curfragnum + 1) =3D=3D pattrib->nr_frags) { @@ -987,7 +987,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, st= ruct sk_buff *pkt, struct =20 addr =3D (size_t)(pframe); =20 - mem_start =3D (unsigned char *)RND4(addr) + hw_hdr_offset; + mem_start =3D (unsigned char *)round_up(addr, 4) + hw_hdr_offset; memcpy(mem_start, pbuf_start + hw_hdr_offset, pattrib->hdrlen); } =20 diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging= /r8188eu/hal/rtl8188eu_xmit.c index 55032d7ae7e3..87095eff107b 100644 --- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c +++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c @@ -347,7 +347,7 @@ static s32 rtw_dump_xframe(struct adapter *adapt, struc= t xmit_frame *pxmitframe) =20 mem_addr +=3D w_sz; =20 - mem_addr =3D (u8 *)RND4(((size_t)(mem_addr))); + mem_addr =3D (u8 *)round_up((size_t)mem_addr, 4); } =20 rtw_free_xmitframe(pxmitpriv, pxmitframe); diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index fca8f3d116c2..56e5cbfec1f1 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -95,7 +95,6 @@ static inline void flush_signals_thread(void) } =20 #define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r)) -#define RND4(x) (((x >> 2) + (((x & 3) =3D=3D 0) ? 0: 1)) << 2) =20 static inline u32 _RND4(u32 sz) { --=20 2.35.1 From nobody Fri Jun 19 08:29:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7ABFC433EF for ; Wed, 6 Apr 2022 09:37:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241067AbiDFJil (ORCPT ); Wed, 6 Apr 2022 05:38:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1572988AbiDFJe5 (ORCPT ); Wed, 6 Apr 2022 05:34:57 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C637120D95 for ; Tue, 5 Apr 2022 23:19:14 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id b15so1366696edn.4 for ; Tue, 05 Apr 2022 23:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5W91nY5g2x/PNBMnEeWdlyukY7wlgLCqBSWWvoZMNo8=; b=hiUy4X2LA1nqaFfDcQ7InCwRGzw3PSPmausfWQ3ChZJ9uFDiaCL2dcjiwVSPNw/qAV sWSIN1HLyP/5jjej30IG9xImLT+sEbYB3qNiBkVCIQkWaFDqw4rB/0i42NDTGThmktde u0DW8ldMQ1ArwSCc25vweHnMh3EMlihmaTSX1lpFGxARcc6/NkI22D4S6hT74yEeWrf2 bDYwO2bj+ogy8Rl83hJtIId+VNNHqGqkCrFd2H/l1oxP3ZGq4f8ascZOMBswR7mR9T26 lkc26D4YMbvYUGFQljUip1MAZOsJ2GOwvv142MaXQPXBKP7wRnu9zXC4mfTPyCFERxE4 NvYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5W91nY5g2x/PNBMnEeWdlyukY7wlgLCqBSWWvoZMNo8=; b=U1EXz6BIf4t1UcEN9iG32Oz0pXQGaDsRkmkLQJz2ceW3CAn9vYmoR/y1vUgVCmWK41 aZCNmdtMVlMairEXizy+IrqXr2uZ3ELi7tio7/Ys4vT0BbJrR+VQsVV6/bs7uDWUmJ+h 937iwRL2cz6NcpHnCTRQZJ1r4PRCQhVqPi+uugPZqUTRBVR/6Jm9ZWNkMQ7MCM043Yyq +yVpnBLRKvamD5DMa4z5Tv+r52jz2EgxLko5Ur5VFSOIrTAOVQ91nuDqTvKlQFT5P7sS rQQONUBHdQqgkl1Q6g/+WtAGSlq2XkrNRxz/Lpp0WbwtcD1ytqyfuapeTSKK19aek2Jh qR0w== X-Gm-Message-State: AOAM533RhSoPDFdCooK6fwT7iBZiPE16aHoUNLOZ+XRnJD525zfyUZuf IHTkoBKMG5W54e6ji6qSU4lg69iK4mc= X-Google-Smtp-Source: ABdhPJxMQvIE9nIXz2sl2HyN4f2u8FCzHt4WeaO6gFBzfgNpMziy7VJQ3LnoEua7c0bTVhs78i2+KA== X-Received: by 2002:a50:9e61:0:b0:419:d8e5:6236 with SMTP id z88-20020a509e61000000b00419d8e56236mr7124021ede.327.1649225953449; Tue, 05 Apr 2022 23:19:13 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id q3-20020a50da83000000b0041cdd6e92b1sm2475251edj.27.2022.04.05.23.19.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 23:19:12 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 2/5] staging: r8188eu: use round_up() instead of _RND4() Date: Wed, 6 Apr 2022 08:18:56 +0200 Message-Id: <20220406061859.9011-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406061859.9011-1-straube.linux@gmail.com> References: <20220406061859.9011-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use in-kernel round_up() instead of custom _RND4(). Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_cmd.c | 2 +- drivers/staging/r8188eu/include/osdep_service.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index ecd0488c439b..4977a0b99415 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -264,7 +264,7 @@ int rtw_cmd_thread(void *context) goto post_process; } =20 - pcmd->cmdsz =3D _RND4((pcmd->cmdsz));/* _RND4 */ + pcmd->cmdsz =3D round_up(pcmd->cmdsz, 4); =20 memcpy(pcmdbuf, pcmd->parmbuf, pcmd->cmdsz); =20 diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index 56e5cbfec1f1..388c22751d09 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -96,14 +96,6 @@ static inline void flush_signals_thread(void) =20 #define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r)) =20 -static inline u32 _RND4(u32 sz) -{ - u32 val; - - val =3D ((sz >> 2) + ((sz & 3) ? 1: 0)) << 2; - return val; -} - static inline u32 _RND8(u32 sz) { u32 val; --=20 2.35.1 From nobody Fri Jun 19 08:29:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3DCFC43219 for ; Wed, 6 Apr 2022 09:36:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1581763AbiDFJiO (ORCPT ); Wed, 6 Apr 2022 05:38:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1573196AbiDFJe5 (ORCPT ); Wed, 6 Apr 2022 05:34:57 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C51311CF78 for ; Tue, 5 Apr 2022 23:19:15 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id c42so1370058edf.3 for ; Tue, 05 Apr 2022 23:19:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DNgNlT+7YKaOvPCk/gmrkhMCJ6Py+Nbw2htQid6V97Q=; b=QI2Gdu2tXG9iYVqWPzCMp1nFFt1kzrAaSBQuv9xvmpATMAJLTsBrtdPzpcaZRi4sDy FhMfnNLYuW5IkKSx51AChbtQAalwUhqgSnwgVlISmyHu6faduh16hRIU7A0UJ0tbHsro 0vIp7nwQp4HVtcLgtPN5gDxvzMPekkyJ2Y1kDGnZx5G3p95WOh3eY30TB5rsDmF8LwlF H4ygxdCVvNu5YGRqEhr32PAqOQifrlmH1QRXuTdLrVSgrAqbkPHBttVAR0m8ACd4xisg +SEYm9pP0u3EB6gmePfm2+dk1ibjoSjvfKte05UBXrMx3yh8mt9P2KudKpsMuCjxIv3p T+2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DNgNlT+7YKaOvPCk/gmrkhMCJ6Py+Nbw2htQid6V97Q=; b=rs1OHpWTM+P6jmRGFPU52bzI/73DHyzIK3JgATizNWPWQ+wwfysaG77ol8XxMvUF5e IIHK+lajCNj9O+30GN+jF92Q8fX6WEzxwqQcfgAbeVgpFCj614sTFSYQJmSplDfpBkcA 7a/eYQAZ48X0GJe1WdI4UKWbECXzuQDH3yP2H/fqC6tMXInIfTmXObDrwxR6RpZAjl9O nwXItm3wIfYNm61DRWQk/6JWVd+g9EbHU7zhdJ1ueCOsj+pzumJe41P0ULaVJjkrlFtU jnzg2KgKiklfotTH6nuWPYYtWnGGlfpUgBaGxvJ5V+s8MJJwmETQLYhTsLjyZZaR1ny1 F37w== X-Gm-Message-State: AOAM53065DxsJ7Ua5AqtZ3OJwIVbdSbmEzsVYG7NAMUJ8DwmPbss+PWx 8CR8m0pzDE5oyYIq4A8ub4RT5341n84= X-Google-Smtp-Source: ABdhPJyuoF4rDcD4UnydR4O5S6Id89eWt1TrCaA9wMFZX4ynMeTR8soUNMakwXSKjQS4TU2NrkiFHA== X-Received: by 2002:a05:6402:d0e:b0:418:f011:275e with SMTP id eb14-20020a0564020d0e00b00418f011275emr7045959edb.323.1649225954273; Tue, 05 Apr 2022 23:19:14 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id q3-20020a50da83000000b0041cdd6e92b1sm2475251edj.27.2022.04.05.23.19.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 23:19:13 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 3/5] staging: r8188eu: use round_up() instead of _RND8() Date: Wed, 6 Apr 2022 08:18:57 +0200 Message-Id: <20220406061859.9011-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406061859.9011-1-straube.linux@gmail.com> References: <20220406061859.9011-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use in-kernel round_up() instead of custom _RND8(). Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 6 +++--- drivers/staging/r8188eu/include/osdep_service.h | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging= /r8188eu/hal/rtl8188eu_xmit.c index 87095eff107b..e00791efccc8 100644 --- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c +++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c @@ -437,7 +437,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt= , struct xmit_priv *pxmit pfirstframe =3D pxmitframe; len =3D xmitframe_need_length(pfirstframe) + TXDESC_SIZE + (pfirstframe->= pkt_offset * PACKET_OFFSET_SZ); pbuf_tail =3D len; - pbuf =3D _RND8(pbuf_tail); + pbuf =3D round_up(pbuf_tail, 8); =20 /* check pkt amount in one bulk */ desc_cnt =3D 0; @@ -488,7 +488,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt= , struct xmit_priv *pxmit =20 len =3D xmitframe_need_length(pxmitframe) + TXDESC_SIZE + (pxmitframe->p= kt_offset * PACKET_OFFSET_SZ); =20 - if (_RND8(pbuf + len) > MAX_XMITBUF_SZ) { + if (round_up(pbuf + len, 8) > MAX_XMITBUF_SZ) { pxmitframe->agg_num =3D 1; pxmitframe->pkt_offset =3D 1; break; @@ -511,7 +511,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt= , struct xmit_priv *pxmit =20 /* handle pointer and stop condition */ pbuf_tail =3D pbuf + len; - pbuf =3D _RND8(pbuf_tail); + pbuf =3D round_up(pbuf_tail, 8); =20 pfirstframe->agg_num++; if (MAX_TX_AGG_PACKET_NUMBER =3D=3D pfirstframe->agg_num) diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index 388c22751d09..ff44c4a37b9d 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -96,14 +96,6 @@ static inline void flush_signals_thread(void) =20 #define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r)) =20 -static inline u32 _RND8(u32 sz) -{ - u32 val; - - val =3D ((sz >> 3) + ((sz & 7) ? 1: 0)) << 3; - return val; -} - static inline u32 _RND128(u32 sz) { u32 val; --=20 2.35.1 From nobody Fri Jun 19 08:29:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3172C433F5 for ; Wed, 6 Apr 2022 09:36:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1586823AbiDFJiX (ORCPT ); Wed, 6 Apr 2022 05:38:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1573147AbiDFJe5 (ORCPT ); Wed, 6 Apr 2022 05:34:57 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3482123BC8 for ; Tue, 5 Apr 2022 23:19:16 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id d10so1419409edj.0 for ; Tue, 05 Apr 2022 23:19:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dnqi2X3VqKcJXFMBrImVZdG4X888h8cJCwQ8yMk/hyQ=; b=EJMyMYzIZC1Io2eWJ1YOIP3IOiSYClaGwyinQHYVALb3GKd21ey4O3XwMx8UATe0zC uZEH4Uvxhh5tQFk1B3db2jaD9FxYVSvlMOuVICWR7fkXm1wxcAZJck9tiEyDnR89drM9 vAn4cK/rDfxeYMiOMLo+jzy4quD3/r56fXmSsjUwHN6iyqOU6xeZUaws6qxeDnk7aSAe vU4supMeCkcH/s7uuvDPAILaxv4M1vYRsatV6jM9wm4EOmyLFGqVGAGRlBkX9Qy8N2Pw fBAjNPMng5rAMs7OEwaPhxIjwHEo7FhHpoh8ak7crnkuD6/b8dt6iT/lCnsfeVVuiYYH cUnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dnqi2X3VqKcJXFMBrImVZdG4X888h8cJCwQ8yMk/hyQ=; b=ihVMPluGYzpBGGSp0Nlf8pigSk31pHzIGijv1VEQF0VcFeIzIUWEHtzHHZ42S+IqY0 c1dygSuMYMRVtzjw780JwbKs2HDGzk/y3SW1mMzb0I05OnNWMb3OxbSkWORPEiF5arny HMzk4rKwMjQLUqt1x1vlqqLZJpcuQ+ua0/ru5CSeA6cgWVw6sLX92eE93iFEiqUY3iD0 rLqHbK3BUNlxwdITNxsh6XeTBZar/z+PN4U7gOQ1Nbm41IVBYTw/MrlPGY08TXkN0jyK 6H4nxjtMEPD3BNsA4pLryfsQHW189WSNzIcqHWXZwOG+RX/IFTmnAsPvFk6At6q7QQu1 mKXQ== X-Gm-Message-State: AOAM530hapT/8iOk34BdgXWG/Jrk/FeRefmLMyOdTaGhrK97Q6bASn6g CMg4ltuT6Xp3urpuStXDkSk= X-Google-Smtp-Source: ABdhPJyqAXpogB2imN4UMPk+9i4abNKV4LekV/pZO+b6CjE5Firicrj3bqXI4+6oKiZF8Yt44obGOA== X-Received: by 2002:a05:6402:1d55:b0:419:992b:9286 with SMTP id dz21-20020a0564021d5500b00419992b9286mr7158021edb.235.1649225955363; Tue, 05 Apr 2022 23:19:15 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id q3-20020a50da83000000b0041cdd6e92b1sm2475251edj.27.2022.04.05.23.19.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 23:19:14 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 4/5] staging: r8188eu: use round_up() instead of _RND128() Date: Wed, 6 Apr 2022 08:18:58 +0200 Message-Id: <20220406061859.9011-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406061859.9011-1-straube.linux@gmail.com> References: <20220406061859.9011-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use in-kernel round_up() instead of custom _RND128(). Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/usb_ops_linux.c | 2 +- drivers/staging/r8188eu/include/osdep_service.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/= r8188eu/hal/usb_ops_linux.c index 6a65dcf57112..d5e674542a78 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -287,7 +287,7 @@ static int recvbuf2recvframe(struct adapter *adapt, str= uct sk_buff *pskb) =20 recvframe_put(precvframe, skb_len); =20 - pkt_offset =3D (u16)_RND128(pkt_offset); + pkt_offset =3D (u16)round_up(pkt_offset, 128); =20 if (pattrib->pkt_rpt_type =3D=3D NORMAL_RX) { /* Normal rx packet */ if (pattrib->physt) diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index ff44c4a37b9d..f6c55f6c9e1a 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -96,14 +96,6 @@ static inline void flush_signals_thread(void) =20 #define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r)) =20 -static inline u32 _RND128(u32 sz) -{ - u32 val; - - val =3D ((sz >> 7) + ((sz & 127) ? 1: 0)) << 7; - return val; -} - static inline u32 _RND256(u32 sz) { u32 val; --=20 2.35.1 From nobody Fri Jun 19 08:29:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89A7EC433FE for ; Wed, 6 Apr 2022 09:37:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344347AbiDFJjP (ORCPT ); Wed, 6 Apr 2022 05:39:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1573069AbiDFJe5 (ORCPT ); Wed, 6 Apr 2022 05:34:57 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2F1B125CB9 for ; Tue, 5 Apr 2022 23:19:17 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id bq8so2063659ejb.10 for ; Tue, 05 Apr 2022 23:19:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XRSeg/Lx0QJPiA9N9HHqOiU0JUD3WFJS5KpLC8e8al8=; b=hAlKLpwqlxQfWYv8WAtYio5MqemQ+ZxJp68y8dLhZnbhPVsvdI5OwQ8eH8e2TLqsB/ K+0pv/feOiCVp44t+pTuKjMELYjGkkYB91tC//gM+bMZbVOXcxIyBlE7xEIF7ZSKIkxA nIkIjRFvuAhoW86ZvcE5VDgYsa1z/J08GNO9OJQ1h7L7oS54oHCLUbT04ibs/BZJiaVK emQAa1w0yRPxwJHvZSdhi12NiuS650Nlv3FJ7tmtv/+Nnl1cgiMGSJwuS/0ltx+HC+RW 8DChNYEgRgQvSYcKdUNqnSmGyMMcUDqT6GbOyJ6tiWrOencTJo7uJHoVPkfpiZ0/ut4z mTog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XRSeg/Lx0QJPiA9N9HHqOiU0JUD3WFJS5KpLC8e8al8=; b=zo3VhGvg+0Rgo4Ac8BDy16HkyGhwvGQM5prNdBVfYHHsT18r85d6pI/+ttXf5rd4A7 3dSndhzQBoDOpINid3YNOseQVwmDnymEgY88w4hes48HfiVlcIAzrq+yUAAm3uyqRlDC dem8GUpWNI8x9UR+rmHASCcfeZRedV6U+BNvVcDK2cmkYbs2Wa5+nJNrpw1le3Cqh/gW NjJoIRpzthvkMr9IEzDNkX0Axk/WX6ZPm8jaVb12dRz1RoEOGmtzY+KC9RN8MF1hOrVQ hNk5yBTi39O0U8Dn/LCCoIbn/YtPSkFuPoolmQ64ObBW8b3eiwBU35jWwk/lPu2LVaKr 3Z4w== X-Gm-Message-State: AOAM532D8MnbPObeeoSirgbjxm9Vkwj2F8lA4I7E/OAnmtuE3WKAFKAG uy/rK605ZvTtJGZWw3kNQQA= X-Google-Smtp-Source: ABdhPJzVASTH+rw+vBWafl7Vx3lSBIUK0lzuB9Wzg1uKkED1RFkQZt+lw06cgao2WU3AdEDbF7/sMQ== X-Received: by 2002:a17:906:a046:b0:6b9:20c:47c1 with SMTP id bg6-20020a170906a04600b006b9020c47c1mr6779846ejb.615.1649225956258; Tue, 05 Apr 2022 23:19:16 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id q3-20020a50da83000000b0041cdd6e92b1sm2475251edj.27.2022.04.05.23.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 23:19:15 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 5/5] staging: r8188eu: remove unused _RND* from osdep_service.h Date: Wed, 6 Apr 2022 08:18:59 +0200 Message-Id: <20220406061859.9011-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406061859.9011-1-straube.linux@gmail.com> References: <20220406061859.9011-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove the unused macro _RND() and the unused functions _RND256(), _RND512() from osdep_service.h. Signed-off-by: Michael Straube --- .../staging/r8188eu/include/osdep_service.h | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index f6c55f6c9e1a..f1f3e3ba5377 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -94,24 +94,6 @@ static inline void flush_signals_thread(void) flush_signals(current); } =20 -#define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r)) - -static inline u32 _RND256(u32 sz) -{ - u32 val; - - val =3D ((sz >> 8) + ((sz & 255) ? 1: 0)) << 8; - return val; -} - -static inline u32 _RND512(u32 sz) -{ - u32 val; - - val =3D ((sz >> 9) + ((sz & 511) ? 1: 0)) << 9; - return val; -} - struct rtw_netdev_priv_indicator { void *priv; u32 sizeof_priv; --=20 2.35.1