From nobody Fri Jun 19 07:15:10 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 924C2C433F5 for ; Wed, 6 Apr 2022 20:16:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232973AbiDFUSV (ORCPT ); Wed, 6 Apr 2022 16:18:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234300AbiDFUQ7 (ORCPT ); Wed, 6 Apr 2022 16:16:59 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7452228E35F for ; Wed, 6 Apr 2022 10:22:37 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id d10so3530448edj.0 for ; Wed, 06 Apr 2022 10:22:37 -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=dQHPYFD1Py8zNnywpsqR57whk+RQMCTk3DSycMVZoGs=; b=i3285HxhOHK+wsC2Sx1TdhTQ+r7HTGVY90ljRxlx5XyfINjbt5tgpYWCX8OOchd/AK KSRf1EIcTp0BC/+unXiBAoc5zggnumgcKHKD3RNsFV/uALsMxQfgTTiQnTz0BbY2Xp5Z k9xgMH2wYhIeShrQGa5E39WZn5iiJ3hd06q8c/i70lGPnCsMTiH+ApXi2r66DIZbMwEr N6rO7auN6KtNdQejV7+SzkUWFrNVQp7noRR++bZ3aI1vAvahlXc+gXZzFnDtIgfgzJ+v mOb/kQxf+M5+kuKoznZBqKA6eb7KHSRSuoEKjmBYgqBcwQzsEA02Pmm6VjOac6sTymGl GPcg== 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=dQHPYFD1Py8zNnywpsqR57whk+RQMCTk3DSycMVZoGs=; b=zIGP3cAlUQJo5sfD5UHv2QmF/EdBzxWgustaRUfDoH7tDoEqfls14b3NCDolSCYjI5 Md8GRTpCt5VOgOISSUQz4EKYlwYwPY6EaNArbl5PNBnH7DJSiQrM4FA4NwQKjaGUdDiQ 8tfZM+HzesGqEjZ5NoKPgOO1K+WwSbL5rkoJTRBRJ5TAOVTBDhR71mw5k+xUg6r+FSHT NaBXgjGV6YF3qH9+keikgnc8Bnd2Ofy9RkiCz/ZfKdWL6VTTr5yrbKBlF7dcqSylgeTD NwpJeTLguXxSoLZfamycD9BGRLssQOwVv+8yfhQ5+K/JbHYzv+e11FvfnDuUa5gW29Y5 WDjQ== X-Gm-Message-State: AOAM5305BIYPW4Ytnq+NGAWFaUU/mJEzFMSxkYPwttFkMuHt7L8JsMz0 tcr3C9balwdvrmuUNIlW7SQ= X-Google-Smtp-Source: ABdhPJxTLzdy7NH5f/05EmF9B7YY/OHkx1w89J5gA3kDRTQwcqmx5OjjXPssz+kL8Id3eYvIFvDyOg== X-Received: by 2002:a05:6402:1909:b0:418:d876:3119 with SMTP id e9-20020a056402190900b00418d8763119mr10249749edz.266.1649265756026; Wed, 06 Apr 2022 10:22:36 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id da19-20020a056402177300b00413583e0996sm7912730edb.14.2022.04.06.10.22.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 10:22:35 -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 v2 1/5] staging: r8188eu: use PTR_ALIGN() instead of RND4() Date: Wed, 6 Apr 2022 19:22:15 +0200 Message-Id: <20220406172219.15565-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406172219.15565-1-straube.linux@gmail.com> References: <20220406172219.15565-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 --- 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 Fri Jun 19 07:15:10 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 DAEA1C433FE for ; Wed, 6 Apr 2022 19:45:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232242AbiDFTqy (ORCPT ); Wed, 6 Apr 2022 15:46:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232220AbiDFTp4 (ORCPT ); Wed, 6 Apr 2022 15:45:56 -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 528A328E49A for ; Wed, 6 Apr 2022 10:22:38 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id w18so3424108edi.13 for ; Wed, 06 Apr 2022 10:22:38 -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=CwqBXDz668FHAz4y6CpGiuk9ISChfbzhgCaR+tulTMk=; b=EvHMKCFZCZDfyLJTYvlmtVf5grd8BgJpV5V6KZJqOS53R1pGZ7CNR6kyTy6ChuiW9Y XuQCu3tDeJo74DAXUvqIxMt11hXqmHTfV7wO8zIJLxeVHuZcVUFFlGTdUrXi/RhJNDei PYSWVg2NF80s7l8CPVv1U2RvjUVMcpzWOgvk686K91f15MO/SNTimslRG6g8cPzhD3EX MZ7EUYPPjkxNMV5xHSN4bQoEDNC106BbPvZz2V9fjzojEkXJODCxERoV/1BD76fVIrGX uygIWzW38kj/1lQ+DCHNsIvIl9p/3ulb8nSVy8pgA/zP64I7sq608GyVOt2QU/NFG+zf wPig== 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=CwqBXDz668FHAz4y6CpGiuk9ISChfbzhgCaR+tulTMk=; b=NYrcd7wGZ4rgdcFWiAuHHTY1hzuuC46cvUHlZat9pQIiRXxJvVoWBBBNGHfJJYJWAW LwR0JXR34PDLJ9s9r5dfTnBOO+BD4l3y/t49j4Ucc+eSJH3BBs5Bi1WoJ9yjTGvpeoG1 D8qlzocOyl1e0LWFW0ioukqM7jEUMa3POoKb64uCOnU+d7SP5/SH5jnEWGU2vFHs0oaV k4UX40GhCX8aTiagWja7BicTDO7SsnE8qMEZkaBk4WKySD6hFD5Xj0ydN9njcb/8dRX7 MVcQvCdNBOTf+uhV3fyzOrjqY0BxbrdIvOFq0lFGmEMqNtGp2KcTIid2jrMo9Y3iF6wT blGg== X-Gm-Message-State: AOAM531BiMUHHtkN2WDJ6PzpEZifDRLfYh4DWq5Pcozv2G+fMwrTWDCZ zLP/29OlCLtK4dv8ISIu3Mc= X-Google-Smtp-Source: ABdhPJxEA2MeNQtB5aPt+y7Y43evp/8rgGqQFSwINva8bP39DtlmAZlA+iBJeLY9vUpK9mLfxAYcEQ== X-Received: by 2002:a05:6402:5146:b0:415:fd95:6afa with SMTP id n6-20020a056402514600b00415fd956afamr10007508edd.200.1649265756888; Wed, 06 Apr 2022 10:22:36 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id da19-20020a056402177300b00413583e0996sm7912730edb.14.2022.04.06.10.22.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 10:22:36 -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 v2 2/5] staging: r8188eu: use round_up() instead of _RND4() Date: Wed, 6 Apr 2022 19:22:16 +0200 Message-Id: <20220406172219.15565-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406172219.15565-1-straube.linux@gmail.com> References: <20220406172219.15565-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 --- 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 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 07:15:10 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 D369DC433F5 for ; Wed, 6 Apr 2022 19:49:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232447AbiDFTus (ORCPT ); Wed, 6 Apr 2022 15:50:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232220AbiDFTuU (ORCPT ); Wed, 6 Apr 2022 15:50:20 -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 0E8B528F83B for ; Wed, 6 Apr 2022 10:22:39 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id q26so3457814edc.7 for ; Wed, 06 Apr 2022 10:22:38 -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=pdJD0sEz6JwadVVPr09JFw5k3V85Yh/6gSBnE158MpY=; b=fvdNsxkRy3WWly5FIzP7B0aqEiXB88vpmchkCe+qdiFRcqBjIEW7bEwTJhNBIi+Udp x6v2sIHGISgtnSFjsWnbTCI/qq/UIk4LTD4K0Lxoxld2aj5nN09atQQ0TLZlATTXu/l6 LudZ1GbQSbyyx9VAqVs6gMYlkR+Cr3OnV3/z2OXPlAJ4NYzOqYEQ2cPOGCU+BnEuoSuk UuxN/gyz/Atf3qYAos0j9x1Q/LXk1PWrDlPC3FRExAJQE8gj4b+Q3KzejN2C9V4hAA5B kq4DwToVP6IJEGVtUFxuz1VbflO0U7At7hll8YHGunlmFrx6kUwg56+8acN0yc3ubqun eQvg== 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=pdJD0sEz6JwadVVPr09JFw5k3V85Yh/6gSBnE158MpY=; b=JBMjgD0ug8wtiBfN3lJu7HjLOxvzT9o5haY8jbdNFa7iKxr5XSVsCu7cb5xRFE9n6K UEJltKxZYogdaIhWQKROiBse6AQmv76QLpzV8tdVTvevwUiq77ruKDfgo5UIvmFub5KD T5ihtxj8JzOhCrImEK3f6GBMvnsiVBm1hDNLtU6AZkXStm36Vf9s9/MLCP4yYL/yfxep ai27ZcVJohrATKpzDxhZuZEG27jZYkXoOTMzUm0Zg2CcrT6O8QVQXInyTs49oCJi3q1A QSXpeUqpf3MpnnFuLif098HsFc/HFLsZZYvmtp5tJ25Y184ftv/l0g6n2KJKoLjnRPpm 2elA== X-Gm-Message-State: AOAM533WoQK4CM02Bygh0F8l5YVyI/vrNnnb+q6KVk0Gnxj8r5HCSzo5 utl6D2gBddGhUeGYcGAyDmk= X-Google-Smtp-Source: ABdhPJyyp3Tik/xLKv/T9iImv2aa39sxGQbc2ut7VH4ZAYYM1I3/7Ab7q13INWl44i3OuioMWgWEow== X-Received: by 2002:a50:9d0f:0:b0:416:95a3:1611 with SMTP id v15-20020a509d0f000000b0041695a31611mr9953294ede.77.1649265757668; Wed, 06 Apr 2022 10:22:37 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id da19-20020a056402177300b00413583e0996sm7912730edb.14.2022.04.06.10.22.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 10:22:37 -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 v2 3/5] staging: r8188eu: use round_up() instead of _RND8() Date: Wed, 6 Apr 2022 19:22:17 +0200 Message-Id: <20220406172219.15565-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406172219.15565-1-straube.linux@gmail.com> References: <20220406172219.15565-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 --- 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..2feae03a271b 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 07:15:10 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 E2786C433FE for ; Wed, 6 Apr 2022 20:23:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234482AbiDFUZt (ORCPT ); Wed, 6 Apr 2022 16:25:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234575AbiDFUVw (ORCPT ); Wed, 6 Apr 2022 16:21:52 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3C973F8B2 for ; Wed, 6 Apr 2022 10:22:39 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id r13so5708731ejd.5 for ; Wed, 06 Apr 2022 10:22:39 -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=dNWDQ+SBeedDH3/uGrxlIj4RJhbApNvdMlPMyXTlGHg=; b=JUeZRMgVMrv8s/512RhsUdmWSugjm2gqZ+/GcQ8VMTZMTPAtIBcYOnHkoNxAPrngnk fLSSUpldGFWpovIlXY7nfIQTbYpRmiv8QC0UqqT7Kd01C2JfH0F6ZlEbRiBbLWk09K21 3gkcYq6n/NBmZr+I0dSNqrNNd1FKVrDARugerNuyyDK3DxV0iCdaCi0RmnkS3I4Ij1ov BXabaQFYpbZCiuTPSaiqNMfbSLGQ2NbCCWnfOe49mLdFd49D4vMeBltb0nhJ3IeJaBrU DBUMFeK0816mEg1aUntfdkjM3A9+Kk4B1ysz5+n84pfuZDqYwlnavUPe3S8QK54SzwMk wgFA== 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=dNWDQ+SBeedDH3/uGrxlIj4RJhbApNvdMlPMyXTlGHg=; b=pghMu7NP1C46NC5UTm4V48XwgBW+JLEQzvUWT7vwnFuWwvDmEyjWLYkz5RaU0exIV+ WwnGRwmRd+/g4jAneXM0Qlw/CfILVcU+eFV1/LTKtL8fp7xu2U3uMw8CxsDrI3WXNccU DIj3BxMWPX1SSEHY4dD0QGXZmUahxGdv8uzfGwlMzQC5Pxd28u6cZcCN7Wo5tk5bB/Ay wLO4nA1tdZuchq2M2B6Qq4V1+tM3s6gaDoS1151u/41KzrmF+lX6BGP4p7iWeU0hdsaU 7SkNlhmnSVLKfuFkLY5/J6YbYyBAIVLMk9CMOmsI19KB67Y2GfyMW/xRonJXyvF7/ie5 KEUQ== X-Gm-Message-State: AOAM531PxKDWeS3G7mlW1GXgEj/0KaqxpCB/BLUyYK60rYH0xq63rqyf 5BVzG0dgM5tylcKTsL/5bnI= X-Google-Smtp-Source: ABdhPJzNy7M9OZCFmM+qTuEWZIRwC6GxeKgxZQr0qIK3EkVZLFnCHkHBagTMSj4B69FNafpb7Fa6PQ== X-Received: by 2002:a17:907:728e:b0:6e7:edf7:f0a4 with SMTP id dt14-20020a170907728e00b006e7edf7f0a4mr9489345ejc.497.1649265758418; Wed, 06 Apr 2022 10:22:38 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id da19-20020a056402177300b00413583e0996sm7912730edb.14.2022.04.06.10.22.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 10:22:38 -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 v2 4/5] staging: r8188eu: use round_up() instead of _RND128() Date: Wed, 6 Apr 2022 19:22:18 +0200 Message-Id: <20220406172219.15565-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406172219.15565-1-straube.linux@gmail.com> References: <20220406172219.15565-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 --- 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 Fri Jun 19 07:15:10 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 C12BBC433F5 for ; Wed, 6 Apr 2022 19:28:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231714AbiDFTaZ (ORCPT ); Wed, 6 Apr 2022 15:30:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232504AbiDFT2W (ORCPT ); Wed, 6 Apr 2022 15:28:22 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FAE1196D62 for ; Wed, 6 Apr 2022 10:22:40 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id x20so3443546edi.12 for ; Wed, 06 Apr 2022 10:22:40 -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=B+W0ovMUi1rIKA0H93ONQhbPqTAcvMIJLIIKO5SgqwQ=; b=IzSY30tgeyKhJuKVSko7726mC81nlvAkiLdzsHO/ZwKLkKoHDRbmlJjHKuYL1Epend rs/Aqq7xdrjRZLwegY34CwXuxl2+zVh61xNV32DA/KHraAHU9EAzvpcnemAEyZFKOzWA Ofi4K2bGrWCXUsD4ztxL/uwDCjD/DrVAxhzbkXA4JHVsnDmjdR+5jbxUBD2y+6qOlH1T Ak+gDSxY//HWNaSnUOcVu/DYS2XZu5ZzwqJtdDXYTZ43H/kYjRFFjb4Duhx51/zG6i5c 48IZillBqMKk3h4fth3Szwm86RUPZjYhsT3ITtKe7NaleefGYdmauqxXrUrPBBswSsDN jLbw== 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=B+W0ovMUi1rIKA0H93ONQhbPqTAcvMIJLIIKO5SgqwQ=; b=t/7RAcYsog0A0xgM8HvD8k7bJP0s5NsyBtqreI0Fjl2/c8Aiw2LfFsOJsKwl8/CcaW UrUmRGFQp9lnAiXNzPRlJv9c7kjOsYILhCAG7QCEDV5BIvlpMnG8mlJJtr4BIkOY1kEc kiCG41fXfMcAqBUCGU+f5GiqlJEay+YF6sf4QQ2fjbD1hCR2qAxQy8u6f4jJntzb3M2i 9LQobleyoRwD53zBKHLDMYKqZ7Fp6h5JwkarRdp8AIzvkWs+fIrD5gmaVOYLoeq92w9J 1PPB5HBzvBd59SAmI1X9F08iDfS/Cbw3UHqktjXo5zE0Xsn5ED5GQ1LyBgKyq5WrJLBt xG8A== X-Gm-Message-State: AOAM531yRL0bMIaxXWvUvyD2ZSFbBVdl23LIRJii+PfR4InnSz6k70Ak 9w8PJ4CTJX1H6lOazUj4JS8= X-Google-Smtp-Source: ABdhPJyV9ip0vEfW8t15CaHBNwMXTEUy7+OTeQqIbWiHb4nBZQ9DWREueTCro87PMdTdruq9R4xykg== X-Received: by 2002:a05:6402:10d5:b0:408:f881:f0f3 with SMTP id p21-20020a05640210d500b00408f881f0f3mr9857798edu.112.1649265759220; Wed, 06 Apr 2022 10:22:39 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id da19-20020a056402177300b00413583e0996sm7912730edb.14.2022.04.06.10.22.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 10:22:38 -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 v2 5/5] staging: r8188eu: remove unused _RND* from osdep_service.h Date: Wed, 6 Apr 2022 19:22:19 +0200 Message-Id: <20220406172219.15565-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406172219.15565-1-straube.linux@gmail.com> References: <20220406172219.15565-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 --- 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