From nobody Thu May 14 08:09:12 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 44E4BC433EF for ; Thu, 7 Apr 2022 12:58:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245579AbiDGM75 (ORCPT ); Thu, 7 Apr 2022 08:59:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241162AbiDGM7t (ORCPT ); Thu, 7 Apr 2022 08:59:49 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3FCC6C914 for ; Thu, 7 Apr 2022 05:57:49 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id f18so6313468edc.5 for ; Thu, 07 Apr 2022 05:57:49 -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=DhBV9fSUs/h1yxQ+cBz6nBKH5UMTCWQCPrPfKTVvcIc=; b=BSS4VNu7ODpEcdLkoR08kArNJC6n5/uLzHUrLxtD9C7u2qFy8WQ2cB/q+sGaD5keHS YPeJO3RhBFf0fAzaGBs3a8nPaEg5fJK7CsUAXWUb0GwnQhZe2jnnIp1PJVEcZoOXx43e Nhm0MRLxPYaGFw7zTofznmZZ7euw0ZHtqyYrXBl1GwQlrrOEatoPUhzQF1h33SP9CSV2 fQJS4kXwM8CNfd/LlRI9MoXzj0VZsz2uqvEKSUbuU0J1y3/plhJnO7zH92rkVG9A1juN YxzwUIL9zhZZKbKznbzh3wxEGe28EYmGKs6YUDzUixILDisUVPJN/wnqzD0L0vQAc1T4 d+NQ== 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=DhBV9fSUs/h1yxQ+cBz6nBKH5UMTCWQCPrPfKTVvcIc=; b=uPJ5oARxJNdyXF2zmr8UDwqWe6ScR5AEse584ZgcIXgnl1KbT8/3v1W71SCYk4MEsS sYLCTulRR7HaSxTnAWBpVym5eufytvnMhVyOpz9L2n818Y7qlKG43lcvdH4hrBg7/pLj xTb9fw1BIKrJN0Nbju0mvSPibWcc6RGBGww5Yv1dTneKLuy1ZOmcoyU8cGhWHbxzvB4t yJFVqi8Yp1ga0OzKmF4xY69ZkMqytlRXeQp6/YPQUiWiW7Hb4QAKNEHoV8GZwM66svIz 8S7//t82qdKcU/NBVsRAaZ+cbMx2ZOL8vnbbm06cyTBHy0tjTTmX6p7EUsJRr9Q7ALds FoBQ== X-Gm-Message-State: AOAM5305k2dML3DDpKbEK8dwfnWaBFNvI/KzHkWnq2VwOOUY9hs8OQFU i1XaBNv2OKAdNPHFZgKMBA4= X-Google-Smtp-Source: ABdhPJzNEkdolj1fwRZkSHCDdVLOqdSreLW+sdhMxT7ie2gX60F2ufWilY7PnlcaX+RjiR+iHnhg1Q== X-Received: by 2002:a50:9fa2:0:b0:41c:d9c2:6b19 with SMTP id c31-20020a509fa2000000b0041cd9c26b19mr13884900edf.393.1649336268558; Thu, 07 Apr 2022 05:57:48 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id n13-20020a170906724d00b006cedd6d7e24sm7676764ejk.119.2022.04.07.05.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 05:57:48 -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 v3 1/5] staging: r8188eu: use PTR_ALIGN() instead of RND4() Date: Thu, 7 Apr 2022 14:57:38 +0200 Message-Id: <20220407125742.7814-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407125742.7814-1-straube.linux@gmail.com> References: <20220407125742.7814-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 PTR_ALIGN() instead of custom RND4(). Signed-off-by: Michael Straube --- v3: no changes v2: use PTR_ALIGN drivers/staging/r8188eu/core/rtw_security.c | 6 +++--- drivers/staging/r8188eu/core/rtw_xmit.c | 7 ++----- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 2 +- drivers/staging/r8188eu/include/osdep_service.h | 1 - 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_security.c b/drivers/staging/= r8188eu/core/rtw_security.c index 2cdcdfd5ca5c..5bba57d18b5f 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 PTR_ALIGN(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 PTR_ALIGN(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 PTR_ALIGN(pframe, 4); } } } else { diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index aede8ef8b098..029b994e1b71 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 PTR_ALIGN(payload, 4); =20 payload =3D payload + pattrib->hdrlen + pattrib->iv_len; if ((curfragnum + 1) =3D=3D pattrib->nr_frags) { @@ -868,7 +868,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, st= ruct sk_buff *pkt, struct { struct pkt_file pktfile; s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz; - size_t addr; u8 *pframe, *mem_start; u8 hw_hdr_offset; struct sta_info *psta; @@ -985,9 +984,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, st= ruct sk_buff *pkt, struct break; } =20 - addr =3D (size_t)(pframe); - - mem_start =3D (unsigned char *)RND4(addr) + hw_hdr_offset; + mem_start =3D PTR_ALIGN(pframe, 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..9bd2428514de 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 PTR_ALIGN(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 Thu May 14 08:09:12 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 60900C433EF for ; Thu, 7 Apr 2022 12:58:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245585AbiDGNAC (ORCPT ); Thu, 7 Apr 2022 09:00:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243515AbiDGM7u (ORCPT ); Thu, 7 Apr 2022 08:59:50 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BB6848E73 for ; Thu, 7 Apr 2022 05:57:50 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id p23so6284971edi.8 for ; Thu, 07 Apr 2022 05:57:50 -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=I2kKuQm9mBVMxGG2tuqK5kvCq3TE0hPoH+duL8WuPFE=; b=fREgNyiTU+JgehQuQun/naOApONGw77/dtDLqvcR2nsBwPsXkPL44tiLSGRkpl+g8U nVQTq7mUgmzMGC/FV0TUy5+XsuUIic2y79YJ3KLnA3Em+Ry3mvg/3dnASZsGwi+l0Qu4 qSLof8irjPFEG26f7yW11EVSQbayAVC2oEn2O/FClJkObCqo0Wi0RijRzPW7+XMuflRV 1fW49RE7eO3DPVOZjhFo7LrpiegCKlzb79Z70GdlOJLdHXN1U9vfedInRfsvZr0lRCeG rgFjDQzge0XSGnifixG7ZxtlqFxKrUHEcr1kQoC1A2gQFYIU18lK2k7UDpqPsOSfS08v N66w== 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=I2kKuQm9mBVMxGG2tuqK5kvCq3TE0hPoH+duL8WuPFE=; b=BLBzlopuZG08f59rEbrGtuIDKwVNbz2u3wN7IIJoX/0AApXJRW1VvKUtj4kQc2IdaG ANkVT9h/cJiQGVFajJOZ+7gWH7ov6vAAjqFJmsVF+k4fRGZzp5daAxGjfihdsZbWyg7W GJHpTUF029z2nK2NLD4ZkNAMF5HcbQHS5yLN4ZYY/mF9rOyHa+JcmQdOB3SF5yWC8O2L ya+R/5r36HTdO9lOIHRnXG671yZ1LcdeLsMtfhT9/3RaEfvrh8FawS7lgrsdEAzLw2tG p9E4n0wmtkDExAWZo8I4/y58lYjYOBCa9qMf/i/7U38F6v3HeWFsQx8wx27qpLzPXhK9 Nw/A== X-Gm-Message-State: AOAM531F8PCRKJO1nqx8gVe5uwa13Ku96tyCAUuB76i7fnF0OVfkIvBR z2NaxLzV2iJrz5Mw557qvVk= X-Google-Smtp-Source: ABdhPJzipgYuM30uDF84FFOslfVMcPdQ8T/8aZ0+xYG7Wk5AyEfieXrgPeFqOSRCjuOFlA74RwPVJA== X-Received: by 2002:a05:6402:4247:b0:419:3990:3db6 with SMTP id g7-20020a056402424700b0041939903db6mr13837423edb.193.1649336269266; Thu, 07 Apr 2022 05:57:49 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id n13-20020a170906724d00b006cedd6d7e24sm7676764ejk.119.2022.04.07.05.57.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 05:57:48 -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 v3 2/5] staging: r8188eu: use round_up() instead of _RND4() Date: Thu, 7 Apr 2022 14:57:39 +0200 Message-Id: <20220407125742.7814-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407125742.7814-1-straube.linux@gmail.com> References: <20220407125742.7814-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 --- v3: no changes v2: no changes 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 9b53b92c6795..ed092faafb0f 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 Thu May 14 08:09:12 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 CB865C433EF for ; Thu, 7 Apr 2022 12:58:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245591AbiDGNAF (ORCPT ); Thu, 7 Apr 2022 09:00:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236115AbiDGM7v (ORCPT ); Thu, 7 Apr 2022 08:59:51 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 743656C914 for ; Thu, 7 Apr 2022 05:57:51 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id x24so1334532edl.2 for ; Thu, 07 Apr 2022 05:57:51 -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=VQFB5yWy+dqTr0/vXZMWZCnU/4D4Laj4hZ4wf3r7fdQ=; b=EdsSwzHfuZMpjh/pj5QJxv5ix7SQQN0fexd1yk+3DYy3b79RdgL/a0qcaJ3ckfuQYZ 3HJjyOSL1QhzSEvv/kX2jPOgUt0STtMQHOfPM2r/ZpsEKyz3dlatGceDC5kxEadL6OHN oF2atjnAeeZqLydyT8zPZVl8bMtNavc2wR4t9wJNY1DkQpBNKZQy36ys1WJjC1qdPGcH cy00Ohyy7NJ11/U9XjyLUmWat+JAMHH/zCDW+vZ+4Y/mPUWtDnJnqtUtq3hUMg4Ri3/F RTsUWnffHvsNXPw2G2PUfHAhOF0/GkYNx9ouSsFFTIMZi+c4nVkPTyyOdEcuIWvYy/Nq UNRw== 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=VQFB5yWy+dqTr0/vXZMWZCnU/4D4Laj4hZ4wf3r7fdQ=; b=DZ6i7y6vunjeoEN1Gl4om8B7Z0vlPyPhOJMG0fjA2YvxfCRnUr2VzVJb104hi03yNM zido4Q58IYWvlcIPLm3uJsQZoKQYEa5G5wLHX3qk0Zo1ghRZgF9lMjC5dvMjD/0onME7 oDg7lyd4msRNfglKAp6Zs9mUd1iZVjgJkSGXCSicXhwpaXrMaEKgyfYe8JkXMwvxR4eV ySoj5HSmdqD4x2iQikgDL6wIrfmTmGIG14L5xkuSdRfVzwWM9yRh5F+QlOll2xmKjb/l LBHPvFdZWufb4gBC9B81nW25qyBnSW9AkSClh1bsMWOx8XrVVgjdXYasxeWokxB7TBee coEg== X-Gm-Message-State: AOAM530ws2imQ0CWyxkYR1UOMKH/1A30tchKsIGknNbB5urKDXcqDsuP 3YQslWN2gC5nAjx7DoS42lg= X-Google-Smtp-Source: ABdhPJzgMxNu9bVKPUiyFBJrI3NYATy0seuQtm3wUICFma8ZcRZ/acC9lzr4cb8MsrM/H699EXtINw== X-Received: by 2002:a50:f08d:0:b0:41c:d21a:e77 with SMTP id v13-20020a50f08d000000b0041cd21a0e77mr13873355edl.277.1649336270017; Thu, 07 Apr 2022 05:57:50 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id n13-20020a170906724d00b006cedd6d7e24sm7676764ejk.119.2022.04.07.05.57.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 05:57:49 -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 v3 3/5] staging: r8188eu: use round_up() instead of _RND8() Date: Thu, 7 Apr 2022 14:57:40 +0200 Message-Id: <20220407125742.7814-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407125742.7814-1-straube.linux@gmail.com> References: <20220407125742.7814-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(). Just remove _RND8 where it is not necessary to round up. Signed-off-by: Michael Straube --- v3: just remove _RND8 in one case v2: no changes 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 9bd2428514de..bdfa51949289 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 (pbuf + len > 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 Thu May 14 08:09:12 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 59B56C433EF for ; Thu, 7 Apr 2022 12:58:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245600AbiDGNAJ (ORCPT ); Thu, 7 Apr 2022 09:00:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245568AbiDGM7v (ORCPT ); Thu, 7 Apr 2022 08:59:51 -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 2075748E73 for ; Thu, 7 Apr 2022 05:57:52 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id k2so6283505edj.9 for ; Thu, 07 Apr 2022 05:57:52 -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=rVriixE1hFWrvnWyNMXzhhhJoAGwV0Gp7mfloTuErI0=; b=LIT8gkh5Fv+rboebnujcnnCPp9yxRKeoMsaxvL1mt74CZk6/3lZaROVgwB3BmJ+JAy yUhmAjsmh5atl7fZLFpx0waC5SszuPS7luaMeiPuVZHp9Ut4uLPD3V9DsRPrNI0suEhJ F9j+6Wr79uFrfy3hJSG1bHPrN6j/PIgiQEGD7xaXg+ZLZB7m/+2LiZl1ML0fDDMYUoKW ZMpUBJro4pyzlB3lej7YY7rFB+Fgha32gpU+fIvKtBGk+QsSNgpyNnyYjrA2/OytOqmx 4SdM9h9TXz/WMiAnu8ME3a9qi8uztoScI3wtyrH81eRRLbP2kY+SWU0kajig4QKGbljO +f9g== 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=rVriixE1hFWrvnWyNMXzhhhJoAGwV0Gp7mfloTuErI0=; b=NaAFu6/ML5dJTYgO9NvIpA6upH7dPrey1tfcF0SQJca7hYVxDQTDV24R5pnFS1ghMx wizak4goxEPkxUZ7NgnVfxRAOE2v4DchPcYmZxy0Y+VrkHCBup+YceDxLON59FeFcCfV VxUHJayhLOpYsBGSDM0grL9pd+98R2Iuaqpa85KY8Sbb/URyDTvV8/i407wSMyfXoPz4 FJJrQTCLn61yee1O8ZdtfCOXgWTDJM7T4zQboxFziSpNaHt/d9goRwcyN530ciZTZf4+ ler0KfIpbAb5l1/ZHX2OgKSngl2ssQQwMltAuImTuXkXiLELWnu5xcsfcAqpuzWh4EOz 3Kdw== X-Gm-Message-State: AOAM533a1r9tesECSkPpt1QTf1Ie1zPhbEh0M0ed2z5QIXoj2Euq53bk zRYISMASQp55PNZroGy78D8= X-Google-Smtp-Source: ABdhPJz6SjaTr+DSYDiC7jF5NkGZEGFlDseahF8t18TQbSLrDfn+I+hjtWh6/Lxu7H3K+FYWyxYFOg== X-Received: by 2002:a05:6402:1e8a:b0:41a:4242:7de9 with SMTP id f10-20020a0564021e8a00b0041a42427de9mr14069732edf.284.1649336270763; Thu, 07 Apr 2022 05:57:50 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id n13-20020a170906724d00b006cedd6d7e24sm7676764ejk.119.2022.04.07.05.57.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 05:57:50 -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 v3 4/5] staging: r8188eu: use round_up() instead of _RND128() Date: Thu, 7 Apr 2022 14:57:41 +0200 Message-Id: <20220407125742.7814-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407125742.7814-1-straube.linux@gmail.com> References: <20220407125742.7814-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 --- v3: no changes v2: no changes 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 Thu May 14 08:09:12 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 5D994C433EF for ; Thu, 7 Apr 2022 12:58:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245606AbiDGNAM (ORCPT ); Thu, 7 Apr 2022 09:00:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245570AbiDGM7x (ORCPT ); Thu, 7 Apr 2022 08:59:53 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE7DB6F4B5 for ; Thu, 7 Apr 2022 05:57:52 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id k23so10687204ejd.3 for ; Thu, 07 Apr 2022 05:57:52 -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=pAbL113tfzbSrZT0XIqHZFep7heNx+dqGSVmNtGYqRs=; b=UMVN1xB+UdBE8fc3zyorV1jCpKBKC6f2L/efUg4ohiVhTHljCV1cu/hJYpxAjx6po2 NQ8fS9CYan4jTcMRvtM2rWdrxTJE0eYQlHIHEmd0OW5Z3SY5k935DaODlMcFhmD6QhA+ 8OJ+q0M7siA2xWjMm945BpNcjIMb1PCt0kyyKqXRJQESsEERhI0H3wPs5mTeDZeqMBxc bnw6FnVSHa/sNSSqkguGZnXRUjNWzyw5aCZcVeI6VWYMpvlTOBIjuvNkpW+ozwO/ZRrx 5vkUrLrfeVcXvI/q7YrLGfHvmdEHhJmS83n6uOdtDr/n2/mo+h6+inilsFzyP3vEZ98H UAGg== 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=pAbL113tfzbSrZT0XIqHZFep7heNx+dqGSVmNtGYqRs=; b=x+RDDpuJFIgcebXc8BExb6u4Kc7PWyRMwuF+7k2f5ip6ZRI2iX1s2xJ5OlS50en2GP 4vKAuR0CDGUSzMNJLI8VnZONWCFvB5qroiW79Ga1mMXpXUUqzbWnKgQIdshTA8Bj0zmC SkDr2KPRvZwUbPXYtTP6UnhkoV4aUl5hxuQGYS2kts4tnT6iglV/5X5x3dUJ7bKQ4WxB LTJh8dGn3w5hzWIeBVvJHAblsvKzC8Fzes9/lEMX8dpnWCUzHB2ifmFw15juYn4P1Z4z xN6Qm0+E6uMNxeIhXVsmRN6Uj6+jlD4pR+33pSMw46m+gCW8SoRIjip9rJMfaH7RYuEM hPYA== X-Gm-Message-State: AOAM531ANwssg7jaCOPmBTQ0JScQf/HEmx9Dlh8XQke0wPY6rnjVUoIF HwAJjBmqCvwdunxMIT2JYfQ= X-Google-Smtp-Source: ABdhPJw+HsL9g2fPW7zwwWyLXKgXQSRJ2hG3VD9fLi4M0GZHCAczq2NSNiyRx8LyNk8NNOxHcNbwRg== X-Received: by 2002:a17:906:49d4:b0:6d6:e5ec:9a23 with SMTP id w20-20020a17090649d400b006d6e5ec9a23mr13076582ejv.79.1649336271467; Thu, 07 Apr 2022 05:57:51 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id n13-20020a170906724d00b006cedd6d7e24sm7676764ejk.119.2022.04.07.05.57.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 05:57:51 -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 v3 5/5] staging: r8188eu: remove unused _RND* from osdep_service.h Date: Thu, 7 Apr 2022 14:57:42 +0200 Message-Id: <20220407125742.7814-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407125742.7814-1-straube.linux@gmail.com> References: <20220407125742.7814-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 --- v3: no changes v2: no changes .../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