From nobody Wed Apr 8 10:01:27 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 1768CC32789 for ; Sat, 20 Aug 2022 18:16:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231854AbiHTSQm (ORCPT ); Sat, 20 Aug 2022 14:16:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230285AbiHTSQj (ORCPT ); Sat, 20 Aug 2022 14:16:39 -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 51E3330F68 for ; Sat, 20 Aug 2022 11:16:38 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id t5so9131155edc.11 for ; Sat, 20 Aug 2022 11:16:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=GkFSCmCmtCp/tSVKJ+Jm/lmW9Ahq2ZlSjrqLfNvUxFs=; b=X6IB1+8hZJ1jMHbhOTGVJktLBGjNSdr5Jmszn44QbM/Lmy9XnJCISYC6lb7G/Za6Lw 4d7ZAHtnw0GZoa8BWnIixUpK+jYW9FBvLj4nUYVYaeO8sKXOc+SYoLa63ky8p0Y8BR5f Ecfj0mfhIsV8Pxrvzw6dbALHxxoPfmNfCTtS9h1MihyfmO0cyy+nWxf4hoa1pAfFsdLV TIIMO7VlWYlGvnFGUzzFjMs0N2PkhB62u/q55ikZAWoL434e4G3TW9gJIL95tBq9fc0m rjbtZ+NwsgO2CZTf+5RgFY1pirmQsuBO8rt64C+L/slS5iiNg9LMLjKicDYq+NVvu873 UgUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=GkFSCmCmtCp/tSVKJ+Jm/lmW9Ahq2ZlSjrqLfNvUxFs=; b=4H9nvuhza/5H0nszAMebLHyQk4XgZZklR5dIXNE04cxN27GEhiHLnRpHJj2wHV3Cnq AMwhHlOfCH8ovNbJEOd/opT+cpdhT2ryqtHw3d0N24Ip503ToiL6Icb0sp6xhWwZ7WSC AaNXygZLxfPIf+5YUjpES4uBdvrjzcDP0SAgeL2rD2cJjMTI4YAZ8MKIl62X2f6gtapS hHutbU3QD3XWVWYwTj9baLZNx9+OpWlcO8kd4yWm3jXYPZswUeorPgFN0XJHZUT5lu5w lB3C67IIqoTRxjbv2izPq4T8Ah26+2wlVNT9uzOoaxM0R3lr5GZS9iEYF5lQbwQAsEnh Ta4Q== X-Gm-Message-State: ACgBeo27e9BHnlXjTiigcmBjdSNciEDy2rU5HBCGCYw7Tg/kd6+ZHSAL ijDWffxl9UTJ7b2q1PfJyng= X-Google-Smtp-Source: AA6agR5as52Vu9ai9fyg6MfnFuq4JB7GgBpqrwwZNS1CpH681S7teflIMGKbmIe06oWHmEIgY/b3Jg== X-Received: by 2002:a05:6402:524c:b0:43e:aba4:a42d with SMTP id t12-20020a056402524c00b0043eaba4a42dmr10279216edd.328.1661019396951; Sat, 20 Aug 2022 11:16:36 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16: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 01/19] staging: r8188eu: make rtw_remainder_len() static Date: Sat, 20 Aug 2022 20:16:05 +0200 Message-Id: <20220820181623.12497-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" The function rtw_remainder_len() is only used in xmit_linux.c. Make it static. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/include/xmit_osdep.h | 1 - drivers/staging/r8188eu/os_dep/xmit_linux.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/r8188eu/include/xmit_osdep.h b/drivers/staging= /r8188eu/include/xmit_osdep.h index 130dc06efe73..55347de455c8 100644 --- a/drivers/staging/r8188eu/include/xmit_osdep.h +++ b/drivers/staging/r8188eu/include/xmit_osdep.h @@ -37,7 +37,6 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitbuf, u32 free_sz); =20 -uint rtw_remainder_len(struct pkt_file *pfile); void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile); uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen); =20 diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/= r8188eu/os_dep/xmit_linux.c index 85ef27735b88..33400a9b08e1 100644 --- a/drivers/staging/r8188eu/os_dep/xmit_linux.c +++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c @@ -11,7 +11,7 @@ #include "../include/osdep_intf.h" #include "../include/usb_osintf.h" =20 -uint rtw_remainder_len(struct pkt_file *pfile) +static uint rtw_remainder_len(struct pkt_file *pfile) { return pfile->buf_len - ((size_t)(pfile->cur_addr) - (size_t)(pfile->buf_start)); --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 2AF64C25B08 for ; Sat, 20 Aug 2022 18:16:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231953AbiHTSQp (ORCPT ); Sat, 20 Aug 2022 14:16:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231398AbiHTSQj (ORCPT ); Sat, 20 Aug 2022 14:16:39 -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 EACDD17071 for ; Sat, 20 Aug 2022 11:16:38 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id c39so9160846edf.0 for ; Sat, 20 Aug 2022 11:16:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=h/sCmXVMZBCUJ8u5FcgfwSBgIpf0Du8Mi+DP75rSeIc=; b=HdabqiFeZaWjRT/jZcFmoOTy7I598cwDfZNRc7VXO4LptdQ9upQfJLqtNFIHo3kOGC BSkQGBmyvX8AjDm0oPwJIw+/Zfv/VJ77vopF2gzy8ZIBk4XMZqlv/m0pcl6lml+XilUf lToouyDvDS6vYvAwf4YllZS5mE0uhGxPngcHvgJ8UEAoa/gBngwzESq9+YHu2jrnXYJS h95eQXncEA6RZXB6rGpzopL8bo6TrDQe60okp4rhUcXIQgNkgvcq823m0YkywnFnRE+6 UdWg45kmSRmX5BqvXHR6xZZ7Zwlm8l3wjxMRYx0lCffkBKb1jra3+fDhEvDKagRNB4lF 1Rlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=h/sCmXVMZBCUJ8u5FcgfwSBgIpf0Du8Mi+DP75rSeIc=; b=Hw0S0LQv0iscvS1QbjS0I6mI2soE5XpVpmviHItSvEjI7u9izRVkoi3BuWCOlccUzx isEZtsv47DCPq1e/SIeByZ7wFmeQwOI65uXMQHH+avtajltiKADIHHY1X0FbVqOktFtS lpvYfCkrPfI1qeldF1eRUMl1LGvPNoKFdkSa9HfJ96xdTlK6N1IbnuI8L9mIG4CAIkvW ue4nj4CcbYbfYTKQ9sayZiP0VT71kXqTX4GIE1ORh1nj0ynEMmh83suU0JdvUXBEGNab 6XLu13lwjW4WiYveR+z351f3IYt699Ya7MTd9Wdb0W/cMWsu1uMZNMFA2TQi6Y/5lGC0 0DLg== X-Gm-Message-State: ACgBeo39hDom4MxMfm2MeCzugGv4PnjyNyu1WEETN6i2rGGZdyLNYxiH EdxwK1cws4N/VACdHb609ag= X-Google-Smtp-Source: AA6agR7iObdlp02vy9+GZYF1PD3OTrPVPO56UxS0IZdwOtJL3qK2LFnX1OOWBTE8Lz0k+OOMQwZcJA== X-Received: by 2002:a05:6402:440f:b0:435:2e63:aca9 with SMTP id y15-20020a056402440f00b004352e63aca9mr10005474eda.162.1661019397578; Sat, 20 Aug 2022 11:16:37 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16: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 02/19] staging: r8188eu: make rtw_os_xmit_schedule() static Date: Sat, 20 Aug 2022 20:16:06 +0200 Message-Id: <20220820181623.12497-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" The function rtw_os_xmit_schedule() is only used in rtw_mlme.c. Make it static. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme.c | 17 +++++++++++++++++ drivers/staging/r8188eu/include/xmit_osdep.h | 2 -- drivers/staging/r8188eu/os_dep/xmit_linux.c | 17 ----------------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index e3cf3e8962fb..c7f69f7918b8 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -641,6 +641,23 @@ void rtw_survey_event_callback(struct adapter *adapter= , u8 *pbuf) spin_unlock_bh(&pmlmepriv->lock); } =20 +static void rtw_os_xmit_schedule(struct adapter *padapter) +{ + struct xmit_priv *pxmitpriv; + + if (!padapter) + return; + + pxmitpriv =3D &padapter->xmitpriv; + + spin_lock_bh(&pxmitpriv->lock); + + if (rtw_txframes_pending(padapter)) + tasklet_hi_schedule(&pxmitpriv->xmit_tasklet); + + spin_unlock_bh(&pxmitpriv->lock); +} + void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) { struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; diff --git a/drivers/staging/r8188eu/include/xmit_osdep.h b/drivers/staging= /r8188eu/include/xmit_osdep.h index 55347de455c8..5a09355a142a 100644 --- a/drivers/staging/r8188eu/include/xmit_osdep.h +++ b/drivers/staging/r8188eu/include/xmit_osdep.h @@ -30,8 +30,6 @@ struct xmit_buf; =20 int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); =20 -void rtw_os_xmit_schedule(struct adapter *padapter); - int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitbuf, u32 alloc_sz); void rtw_os_xmit_resource_free(struct adapter *padapter, diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/= r8188eu/os_dep/xmit_linux.c index 33400a9b08e1..9759ff5ea76d 100644 --- a/drivers/staging/r8188eu/os_dep/xmit_linux.c +++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c @@ -105,23 +105,6 @@ void rtw_os_xmit_complete(struct adapter *padapter, st= ruct xmit_frame *pxframe) pxframe->pkt =3D NULL; } =20 -void rtw_os_xmit_schedule(struct adapter *padapter) -{ - struct xmit_priv *pxmitpriv; - - if (!padapter) - return; - - pxmitpriv =3D &padapter->xmitpriv; - - spin_lock_bh(&pxmitpriv->lock); - - if (rtw_txframes_pending(padapter)) - tasklet_hi_schedule(&pxmitpriv->xmit_tasklet); - - spin_unlock_bh(&pxmitpriv->lock); -} - static void rtw_check_xmit_resource(struct adapter *padapter, struct sk_bu= ff *pkt) { struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 64FC2C25B08 for ; Sat, 20 Aug 2022 18:16:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232026AbiHTSQs (ORCPT ); Sat, 20 Aug 2022 14:16:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231712AbiHTSQl (ORCPT ); Sat, 20 Aug 2022 14:16:41 -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 ABC2630F68 for ; Sat, 20 Aug 2022 11:16:39 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id r4so9128516edi.8 for ; Sat, 20 Aug 2022 11:16:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=MiGVrw4JALqFboIbdo0JNwpxU3evPgpPsmBSJG0+KfU=; b=iJI5prIZyNpks5TyznfeEWp2hYghqEdV+Xt/0Sgb1PurTzOm+1bVNpbSXH0MajAbzn q3+CfLRPpkT2S5OWFX0PBvkob7HLl0+K8G1pwW58SsAA5gJ/2vdw7MRswQfpphFxKwGz dNF9iUqarZLj39LWt/2DjIacoUeCmz1tnoo315mDAIprdJHAEnOkIE1Q+nme/ghF7LkR hmrN+4kDm+ueoYZPCIT1N/cQ+MddjpzXwfdjBmXrxv3JQiN3wpy0bDsXFBgOYVQlyCrS 09m6G5j1fAWA8+gY603vJGEIGfvDsOkEx5A5M9nIUZM+tbo4oAuUUWssjwPjvgRns4zR Lc4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=MiGVrw4JALqFboIbdo0JNwpxU3evPgpPsmBSJG0+KfU=; b=1Izm5mjYgXXEKohfiT+X/rhINSEvYsShN4rjhd8POmTzWQRJELOFWSAmQQgkbY0THa E9GSygrjq+4ph5EXPaVN8hOUWree5I+E/lVx6kAhlkCD+Ox0q72SiO5jUt+X25n2a0z9 /vvZNTNZ+EzOrDqeTnjAotej1/uF1G16p2cOrXSnYADZz0awyLQGV7SwZ/UzqOAThm9c bAMhy6515asDsekslg/GHvSRY+OhyH1rOmL/KZd4Ld0pyFvWnKwPvk7hqG9CNj/PDhjp O/RXFunlV1dZ5fLx3SLJO5/jZeDO0knIfmi7u3TOahoh7xoXxEAOUUUbXix9B2MGITlc lwAA== X-Gm-Message-State: ACgBeo0aiCESL8EGezdKcNL/cyk1S8iiSZBaKvHQ4jOkt730Y6j3QdSa mA9ma2M2mt+JTZPrJTUiZO8= X-Google-Smtp-Source: AA6agR7t1pTTzCt11SKy5ZAq0leRubnuSHeY4d/dJh7WN7mvzLRaXh9ytv/Qnqkd+l/MD5qHxBysIw== X-Received: by 2002:a05:6402:14b:b0:43d:a7dd:4376 with SMTP id s11-20020a056402014b00b0043da7dd4376mr10098052edu.89.1661019398268; Sat, 20 Aug 2022 11:16:38 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16: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 03/19] staging: r8188eu: rename rtw_os_xmit_schedule() Date: Sat, 20 Aug 2022 20:16:07 +0200 Message-Id: <20220820181623.12497-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" The function rtw_os_xmit_schedule() was moved from the os_dep directory. It looks like the driver was originaly written to support different operating systems. Obviously we do not need an extra 'os' in the function name that indicates that the function is operating system specific. Rename it to rtw_xmit_schedule(). Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index c7f69f7918b8..9e7e0034d352 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -641,7 +641,7 @@ void rtw_survey_event_callback(struct adapter *adapter,= u8 *pbuf) spin_unlock_bh(&pmlmepriv->lock); } =20 -static void rtw_os_xmit_schedule(struct adapter *padapter) +static void rtw_xmit_schedule(struct adapter *padapter) { struct xmit_priv *pxmitpriv; =20 @@ -736,7 +736,7 @@ void rtw_surveydone_event_callback(struct adapter *adap= ter, u8 *pbuf) if (check_fwstate(pmlmepriv, _FW_LINKED)) p2p_ps_wk_cmd(adapter, P2P_PS_SCAN_DONE, 0); =20 - rtw_os_xmit_schedule(adapter); + rtw_xmit_schedule(adapter); } =20 static void free_scanqueue(struct mlme_priv *pmlmepriv) @@ -1134,8 +1134,7 @@ void rtw_joinbss_event_callback(struct adapter *adapt= er, u8 *pbuf) =20 mlmeext_joinbss_event_callback(adapter, pnetwork->join_res); =20 - rtw_os_xmit_schedule(adapter); - + rtw_xmit_schedule(adapter); } =20 void rtw_set_max_rpt_macid(struct adapter *adapter, u8 macid) --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 48DAEC25B08 for ; Sat, 20 Aug 2022 18:16:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232229AbiHTSQv (ORCPT ); Sat, 20 Aug 2022 14:16:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231768AbiHTSQm (ORCPT ); Sat, 20 Aug 2022 14:16:42 -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 6A12C3122E for ; Sat, 20 Aug 2022 11:16:40 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id z20so9104205edb.9 for ; Sat, 20 Aug 2022 11:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=PDPIVySPMRGRZRtU+MncznrTlB37IpX4cguK3flnXUA=; b=W6DOBFk9VRRaDkpOdo1jv6Hln3uFH5V6mWgZ2gRGnIL3XyaS+XbCDih+xoOeIcVBuF zXUuymTgdqlQgfUIHsEbKsdks5120TOf3FFwrAMS5Y8uzZYMootTTKnlamQMQDnq1iux YgDuMvwbebdCZjDGtWyqlvEgZtAkWwmeNu0H4x1qc/z7o9E27oQ7NNtopGCeWSdSFypi OcWTztYmz/W3dF9LL3U40ZJVDlo24viwujT/jOgiivm5qn4AfJPPyTL82QrCjqyZJPi4 NtCXr4ug9d1qHfa8Tsdv9JAIPbePoqWT8JvxTlgvYK6hbIZCZM2Uu7Egoz2AnyKwUZMc Xagg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=PDPIVySPMRGRZRtU+MncznrTlB37IpX4cguK3flnXUA=; b=U/1m5CFDGhccTcuzRtNSpDfQsiw9P0erHautmosxPEnjiiLZKYKj7q1At6hh8fq5zQ D7HUUohHfLEWxovcSdS7KcqImYLyQLZcpBbJwTygaZhNtE5mewdPOhqUkTJXcu2enCMj q8qLugHOZdPsNYFW2M+jrsDvxu+ZhF3CJiw8L1nHMu/WZmpUptAixP+80bYk0CJ49mLU NQ7bZMasbQOuPGlKO1ybS+Zste7314o4lejrg6Pw1UHd53gKO+OhHjtYCcvGrZzDeMJs BMG3oVjwFVtTbESTbIziUC8RcUPadJgUjfZLLf7ry6FbmBzXKJFrixgMOnKvkLa1N1HJ UGIw== X-Gm-Message-State: ACgBeo1ZKb4/cdrXQkGSeD1MsgtuWqpInW6GGtYy+Oo4nAwqLlnr3LGF +8G0+OtdTemf+bm11AxwzYw= X-Google-Smtp-Source: AA6agR51CtFX/BfnsCvvr23jdZ8g508/rK5R9ppuxFwdC6mgQpmJtKQDHeakSfVfJhoNw1s2fv1meg== X-Received: by 2002:a05:6402:424f:b0:43e:6d89:4316 with SMTP id g15-20020a056402424f00b0043e6d894316mr10190158edb.408.1661019398953; Sat, 20 Aug 2022 11:16:38 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16: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 04/19] staging: r8188eu: make rtw_os_xmit_resource_alloc() static Date: Sat, 20 Aug 2022 20:16:08 +0200 Message-Id: <20220820181623.12497-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" The function rtw_os_xmit_resource_alloc() is only used in rtw_xmit.c. Make it static. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 17 +++++++++++++++++ drivers/staging/r8188eu/include/xmit_osdep.h | 2 -- drivers/staging/r8188eu/os_dep/xmit_linux.c | 16 ---------------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 48631ef56114..6f3a70a1ab3c 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -33,6 +33,23 @@ void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_= xmitpriv) INIT_LIST_HEAD(&psta_xmitpriv->apsd); } =20 +static int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmi= t_buf *pxmitbuf, + u32 alloc_sz) +{ + pxmitbuf->pallocated_buf =3D kzalloc(alloc_sz, GFP_KERNEL); + if (!pxmitbuf->pallocated_buf) + return _FAIL; + + pxmitbuf->pbuf =3D (u8 *)ALIGN((size_t)(pxmitbuf->pallocated_buf), XMITBU= F_ALIGN_SZ); + pxmitbuf->dma_transfer_addr =3D 0; + + pxmitbuf->pxmit_urb =3D usb_alloc_urb(0, GFP_KERNEL); + if (!pxmitbuf->pxmit_urb) + return _FAIL; + + return _SUCCESS; +} + s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padap= ter) { int i; diff --git a/drivers/staging/r8188eu/include/xmit_osdep.h b/drivers/staging= /r8188eu/include/xmit_osdep.h index 5a09355a142a..82b47b38bafd 100644 --- a/drivers/staging/r8188eu/include/xmit_osdep.h +++ b/drivers/staging/r8188eu/include/xmit_osdep.h @@ -30,8 +30,6 @@ struct xmit_buf; =20 int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); =20 -int rtw_os_xmit_resource_alloc(struct adapter *padapter, - struct xmit_buf *pxmitbuf, u32 alloc_sz); void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitbuf, u32 free_sz); =20 diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/= r8188eu/os_dep/xmit_linux.c index 9759ff5ea76d..fdecb5e1a784 100644 --- a/drivers/staging/r8188eu/os_dep/xmit_linux.c +++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c @@ -54,22 +54,6 @@ uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem,= uint rlen) return len; } =20 -int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *= pxmitbuf, u32 alloc_sz) -{ - pxmitbuf->pallocated_buf =3D kzalloc(alloc_sz, GFP_KERNEL); - if (!pxmitbuf->pallocated_buf) - return _FAIL; - - pxmitbuf->pbuf =3D (u8 *)ALIGN((size_t)(pxmitbuf->pallocated_buf), XMITBU= F_ALIGN_SZ); - pxmitbuf->dma_transfer_addr =3D 0; - - pxmitbuf->pxmit_urb =3D usb_alloc_urb(0, GFP_KERNEL); - if (!pxmitbuf->pxmit_urb) - return _FAIL; - - return _SUCCESS; -} - void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitbuf, u32 free_sz) { --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 76D4CC32772 for ; Sat, 20 Aug 2022 18:16:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232474AbiHTSQy (ORCPT ); Sat, 20 Aug 2022 14:16:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231807AbiHTSQm (ORCPT ); Sat, 20 Aug 2022 14:16:42 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A6A231DC2 for ; Sat, 20 Aug 2022 11:16:41 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id 2so1124590edx.2 for ; Sat, 20 Aug 2022 11:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=2iiedlofv1fkN9T2ZU3EkgMCuLITjKpLLf2R2cOJIQM=; b=AEsz7o6e8ncSjAOisRGbrXWqd6Lb6D6i+Z46CZA80zY6RxUf1xaBjVShI90lhKPXKR zU+/SM2DNkL779x9nWZWNDKECu5BZNErW6zC1rey/U8ti8qN1Tdao/jwIsCpw+Iuc8KH GBEQW42nGsInnKpWDqbmLIkpo/wYn3kgy4Vlw8JAiv3IQJ8rq/vVflTPQ/XWXOuL97qH iiyp1D2ai5XI3rNjIkwnKQEqBaBVe1EKoAQNh7ibChZo0TGPGWBrdADpqgW9ChcFCVcz tTxe/Ltte0jSnuX8QvmCb70JMcFkb8TtpjZY7kMebKZ/vR5GdNdxd3vMKKAmAj7CW4uT sUTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=2iiedlofv1fkN9T2ZU3EkgMCuLITjKpLLf2R2cOJIQM=; b=NZiDWF/i+v8otmfDQ82ddOr/RzfIb+MtzoV09uSXG4TmFuIo4yfbMXBM9T/X3INBdi juvNZQFSkahs+gDL05HNJF5K0FZr6hfNYUeXCc5unQVOVvjLtDFQ6g0Mpz0GUfaKKxNK MyYN0uWjHUt4wYhTKfNrsEn2SRwWVmBCPFC3WWIUvOLzWzivNMAEpjpXSrjUWGmW6Tbd wkI70A3LOUbVnanTILjSneE7MxUNBfaOTSdQMytPPksOQZzLmsOcEjq0DBD1EE47iL2V AB/GlLSbubw7X1eXVlue2P1PHUBJl1+QWOScQrcvdkOIt3KJgqKYLUQF2Z+z0TpYF1cx uPUQ== X-Gm-Message-State: ACgBeo1l+JEotnMwOWnU8sf3+ygP9AX5YFNqehulIyD7Ba7u8DtTSRlu uZ3lpGbf687FM2jnACO4I10= X-Google-Smtp-Source: AA6agR74IV2U1FDGPjYlwqqWQ+oKl5C3hY8cBbfEiMjNzHak9YgN3Jd3OCf4FlS7WuUG6IED/0FoSQ== X-Received: by 2002:a05:6402:5384:b0:431:6d84:b451 with SMTP id ew4-20020a056402538400b004316d84b451mr10086593edb.46.1661019399652; Sat, 20 Aug 2022 11:16:39 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16:39 -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 05/19] staging: r8188eu: rename rtw_os_xmit_resource_alloc() Date: Sat, 20 Aug 2022 20:16:09 +0200 Message-Id: <20220820181623.12497-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" The function rtw_os_xmit_resource_alloc() was moved from the os_dep directory. It looks like the driver was originaly written to support different operating systems. Obviously we do not need an extra 'os' in the function name that indicates that the function is operating system specific. Rename it to rtw_xmit_resource_alloc(). Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 6f3a70a1ab3c..a1d2c2f78044 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -33,8 +33,8 @@ void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_x= mitpriv) INIT_LIST_HEAD(&psta_xmitpriv->apsd); } =20 -static int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmi= t_buf *pxmitbuf, - u32 alloc_sz) +static int rtw_xmit_resource_alloc(struct adapter *padapter, struct xmit_b= uf *pxmitbuf, + u32 alloc_sz) { pxmitbuf->pallocated_buf =3D kzalloc(alloc_sz, GFP_KERNEL); if (!pxmitbuf->pallocated_buf) @@ -142,10 +142,10 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, = struct adapter *padapter) pxmitbuf->ext_tag =3D false; =20 /* Tx buf allocation may fail sometimes, so sleep and retry. */ - res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ += XMITBUF_ALIGN_SZ)); + res =3D rtw_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XM= ITBUF_ALIGN_SZ)); if (res =3D=3D _FAIL) { msleep(10); - res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ = + XMITBUF_ALIGN_SZ)); + res =3D rtw_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ + X= MITBUF_ALIGN_SZ)); if (res =3D=3D _FAIL) goto exit; } @@ -179,7 +179,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) pxmitbuf->padapter =3D padapter; pxmitbuf->ext_tag =3D true; =20 - res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, max_xmit_extbuf_s= ize + XMITBUF_ALIGN_SZ); + res =3D rtw_xmit_resource_alloc(padapter, pxmitbuf, max_xmit_extbuf_size= + XMITBUF_ALIGN_SZ); if (res =3D=3D _FAIL) { res =3D _FAIL; goto exit; --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 CDEDFC32772 for ; Sat, 20 Aug 2022 18:17:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231817AbiHTSRU (ORCPT ); Sat, 20 Aug 2022 14:17:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231896AbiHTSQo (ORCPT ); Sat, 20 Aug 2022 14:16:44 -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 D1F0E31DDA for ; Sat, 20 Aug 2022 11:16:41 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id e21so4294930edc.7 for ; Sat, 20 Aug 2022 11:16:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=usx92kQh3jBW+D0YFniMBn1+nXBeLsReCVppzHDQ5qI=; b=mk6o3CJIkSCm4NsgftksJW74mRbv5WJPO8PCzOjMG2Y7NbohRmXYqbNITTklnItzL6 XoKXYlxpsmhRcsJKTLygo/XPi+Kc9IxOnZUoNm0GsqLXDEcpAGD5O0CQNQHQkQyKDci/ 0/1PUpgm+xb3Fs85jFSoGwo8e9T1MxR9fd3gfF5030qky17hIeuGAd2+gDxoQWEfHMZJ qnZmJYKHSRMmJP44heXN8gMKAE33WYqS2V7rM76b6rPvhpZVEikT5zMX2e9IOaiabG8P KA35TkZ5ZzqToqjKRm6RP8Gjg4TpbSlfrVlB4lTOmvlAcqTyxTTSZMhCKJTqyCvZ9vZD cJvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=usx92kQh3jBW+D0YFniMBn1+nXBeLsReCVppzHDQ5qI=; b=V1p4wGgCsm13MaBHIxdR+pAGKx8ADPbgt+8V2OBH9YzoWlgZIylru/BrKH2ELxMj0h bVwKRB+eTu18GsyrHlR7VATJQpGEeCuJzX/F5s2Parnv7WelPMpe2rZb5n9MU3HoPEY7 zTfhoFoDMWBjbwsovZXgFIiRmrtUze6PvJeUoR0iTl7L699If0rpGKF6xrHAJknriQKe 4ZSHBSa6Gfh9ZrA0z8HcdZznaHCbunH7dANO4y4lWP2ByhSyqk+7UN7VWbrw6u84sONW RvKwnVxtukW5GjZfboJPy4vdpaqVuPJOW7K49m67J5ANlfNCZdJvY6pbD/5Lj4pqsSey cnbA== X-Gm-Message-State: ACgBeo3qE7TyE6jUpAwJDDL7kGbtvTXBskpZvUOkFDtUut17Xgit3xUw gM17xgMnsLSgg4WSB0rWW+s= X-Google-Smtp-Source: AA6agR7BwHRL8xNifPEtOeVRycVZUhK4J6oOllu7LVNjcKLo/gyLZyufwERoq4qszDfKYVSLV61TIA== X-Received: by 2002:a05:6402:4382:b0:43d:6fce:3f1b with SMTP id o2-20020a056402438200b0043d6fce3f1bmr10262690edc.361.1661019400298; Sat, 20 Aug 2022 11:16:40 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16:39 -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 06/19] staging: r8188eu: make rtw_os_xmit_resource_free() static Date: Sat, 20 Aug 2022 20:16:10 +0200 Message-Id: <20220820181623.12497-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" The function rtw_os_xmit_resource_free() is only used in rtw_xmit.c. Make it static. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 7 +++++++ drivers/staging/r8188eu/include/xmit_osdep.h | 3 --- drivers/staging/r8188eu/os_dep/xmit_linux.c | 8 -------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index a1d2c2f78044..426bf87a1404 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -50,6 +50,13 @@ static int rtw_xmit_resource_alloc(struct adapter *padap= ter, struct xmit_buf *px return _SUCCESS; } =20 +static void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmi= t_buf *pxmitbuf, + u32 free_sz) +{ + usb_free_urb(pxmitbuf->pxmit_urb); + kfree(pxmitbuf->pallocated_buf); +} + s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padap= ter) { int i; diff --git a/drivers/staging/r8188eu/include/xmit_osdep.h b/drivers/staging= /r8188eu/include/xmit_osdep.h index 82b47b38bafd..2c663c00b985 100644 --- a/drivers/staging/r8188eu/include/xmit_osdep.h +++ b/drivers/staging/r8188eu/include/xmit_osdep.h @@ -30,9 +30,6 @@ struct xmit_buf; =20 int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); =20 -void rtw_os_xmit_resource_free(struct adapter *padapter, - struct xmit_buf *pxmitbuf, u32 free_sz); - void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile); uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen); =20 diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/= r8188eu/os_dep/xmit_linux.c index fdecb5e1a784..3d298d8187d2 100644 --- a/drivers/staging/r8188eu/os_dep/xmit_linux.c +++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c @@ -54,14 +54,6 @@ uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem,= uint rlen) return len; } =20 -void rtw_os_xmit_resource_free(struct adapter *padapter, - struct xmit_buf *pxmitbuf, u32 free_sz) -{ - usb_free_urb(pxmitbuf->pxmit_urb); - - kfree(pxmitbuf->pallocated_buf); -} - #define WMM_XMIT_THRESHOLD (NR_XMITFRAME * 2 / 5) =20 void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt) --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 7D7D0C25B08 for ; Sat, 20 Aug 2022 18:17:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232490AbiHTSRF (ORCPT ); Sat, 20 Aug 2022 14:17:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231817AbiHTSQm (ORCPT ); Sat, 20 Aug 2022 14:16:42 -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 421FD31DCB for ; Sat, 20 Aug 2022 11:16:41 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id t5so9131291edc.11 for ; Sat, 20 Aug 2022 11:16:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=qVzfHbu5pGUMMhouEyZrkVnSBIn9SzY5DZdTT7h9U4g=; b=AfXZ56h85+QxZ5KoQ2/jNFPLYZV3Lt2RitLHjiRAfa5VhgVuCnSnvhf+mh4Dxu8yBL BVdZ8T11N4oSNt6rVgPKep8D2/CW2iyiOr9CkJZc1vZGjgXBAgd4KvJeECccHEFlqO7E 3jl9JzxDYIKrq5Rp2pMPn9VZg/xdV245vPgZX0JMw9SKmW47KXpPvHG55kNL/lbUbW+y 2+t/GSkKsOfxzDj2X8oBg+dZcCy1E6CjBTykdiVdZfH7VRUZYPpSvQXqxhvSnR3XxEQi GXS4CxX3PJ1izIjxsXiAmvt/ICBSj27S5QFwQixwTjIcT/p8Vcg0RdJLLoiPbV4WvpeN 8cYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=qVzfHbu5pGUMMhouEyZrkVnSBIn9SzY5DZdTT7h9U4g=; b=ALPyU7ueREnHZD5gO6G+Hk49Mx24jSuTpNlK/nSGjH2ogfNiwlJ/n/BSh+cQz5yP3a jdnmeDWSAO+7Qw2TDoDBwxGA9iQiYpjOtH+X2Bp1OVepwUaVW09kpy9tzz34YU2gmYea ozcQuZk89knJcKnE9PcUqcM/Hc7+4Iu69mzMVpxlp4enFVDWfisxM97ERUV3V2g8n89Y ZMQNLJi9Qyake5SxXHO36NC95Wi7LNOwPDo7LtmBIyCy/Plz1IxVd6SJHBV9L8kyrY3u Bb4QW5YXGWeoJUEPRH7e/83JAUcXdorzXzC5vRkKEyl9kTC66tuFEJdpAtZ6nXhHa6Jp t+KA== X-Gm-Message-State: ACgBeo3AJNVmcXCoAI928AYrvO4j7omuIUVsO54o5nBi+oj2v24xKpOY 92VA6g7Bkzu/NNGH1ouwB7A36CJ1MUE= X-Google-Smtp-Source: AA6agR7O9ui7ABd1AbtCzkkjldF3wv5rwC1rytIM3lPLNFCSZ1xyv8CTpQAaY1mVA/a75M7t8Huijg== X-Received: by 2002:a05:6402:4312:b0:43d:b9c0:65ee with SMTP id m18-20020a056402431200b0043db9c065eemr10423578edc.205.1661019400934; Sat, 20 Aug 2022 11:16:40 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16:40 -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 07/19] staging: r8188eu: rename rtw_os_xmit_resource_free() Date: Sat, 20 Aug 2022 20:16:11 +0200 Message-Id: <20220820181623.12497-8-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" The function rtw_os_xmit_resource_free() was moved from the os_dep directory. It looks like the driver was originaly written to support different operating systems. Obviously we do not need an extra 'os' in the function name that indicates that the function is operating system specific. Rename it to rtw_xmit_resource_free(). Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 426bf87a1404..eef1a27e84eb 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -50,8 +50,8 @@ static int rtw_xmit_resource_alloc(struct adapter *padapt= er, struct xmit_buf *px return _SUCCESS; } =20 -static void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmi= t_buf *pxmitbuf, - u32 free_sz) +static void rtw_xmit_resource_free(struct adapter *padapter, struct xmit_b= uf *pxmitbuf, + u32 free_sz) { usb_free_urb(pxmitbuf->pxmit_urb); kfree(pxmitbuf->pallocated_buf); @@ -248,7 +248,7 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) } =20 for (i =3D 0; i < NR_XMITBUFF; i++) { - rtw_os_xmit_resource_free(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_= ALIGN_SZ)); + rtw_xmit_resource_free(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALI= GN_SZ)); pxmitbuf++; } =20 @@ -258,7 +258,7 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) =20 pxmitbuf =3D (struct xmit_buf *)pxmitpriv->pxmit_extbuf; for (i =3D 0; i < num_xmit_extbuf; i++) { - rtw_os_xmit_resource_free(padapter, pxmitbuf, (max_xmit_extbuf_size + XM= ITBUF_ALIGN_SZ)); + rtw_xmit_resource_free(padapter, pxmitbuf, (max_xmit_extbuf_size + XMITB= UF_ALIGN_SZ)); pxmitbuf++; } =20 --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 83891C32772 for ; Sat, 20 Aug 2022 18:17:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233066AbiHTSRQ (ORCPT ); Sat, 20 Aug 2022 14:17:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230504AbiHTSQo (ORCPT ); Sat, 20 Aug 2022 14:16:44 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04F0331213 for ; Sat, 20 Aug 2022 11:16:43 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id 2so1124643edx.2 for ; Sat, 20 Aug 2022 11:16:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=e4jICG6gjMLfwoDo4zWh1kJbnZqKJz6qjRyX07nCUFA=; b=Gr/7HgQwJ6WukK57Ee2kwhhQ+ttuqhIFAg6JWcpP4+wjYC2NcnoT3uGG0OI2gh9jZt pdKG0O1vVYZVVESm+Apj4eisepNZ+kx9Z147O3h5Vpg8Y+TAnhLJNLAxZdJaX8+A5R0B 4n+2Cly6C2vD817qoXpWMCD34curbnoAU+rcYUQKSmGUWIvYvyxoW6iGq9TExmKnMEeR JG4gVF0rPnb7S4mym3EE3sxV88fwCB++4r+5hbGq2QzjQ6Kgae6PkYcNgWZZxp3+Lajs RHA2QJu1EwpzQ/7qY4vxe1ZRdNxofTkvs+blhXou3Y+GSPmMCHB+nohYvx6uFXIe+DvN iO1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=e4jICG6gjMLfwoDo4zWh1kJbnZqKJz6qjRyX07nCUFA=; b=0yG/ntmOJOSpPmfEsiGfhHQZ9qTeyqtQpAbOoGNp+tIA0rNxFu8L9XTBi/TChKvyR9 dWWi+ixjX7JC+zMnZGjGYDsDNzkjhecYaWr8X+0zBRUndWcELkMar+nep3pbHctUa8ib c9nDReYlmRFobuwkavyKYFzFiMyLZO8ZZRTFmON0rGyw1aoBLE1cC8+GL2vl3/rIFctj gdIZkcnApDRtgWp2TpAt3YGoKViI3cMf9OnhrioamCI6mIRsUol/y13Lbp7dkB2vJS4H QbMwlZkWwIKcrLDoc6QYB+sFLpPqiv7xbJ5KRRaCNluUsKLVMcuhTvJ48oDwlXqjDyro OkZw== X-Gm-Message-State: ACgBeo3fweVq31GrU9GCCZwrgwQXNoLZmBBrqMKW2bWWG2JJ+F7aTzmh IvKgx74idXVN4o7NdV9V6aM= X-Google-Smtp-Source: AA6agR6zwR2DTcTb1GMKEy/7A7Ih+d1e823/dU582oGjYfp88DElN5cMOJOCx8BJR/ofYUElG+kH4A== X-Received: by 2002:a05:6402:ea1:b0:443:d90a:5d31 with SMTP id h33-20020a0564020ea100b00443d90a5d31mr10271644eda.121.1661019401649; Sat, 20 Aug 2022 11:16:41 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16:41 -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 08/19] staging: r8188eu: make _rtw_open_pktfile() static Date: Sat, 20 Aug 2022 20:16:12 +0200 Message-Id: <20220820181623.12497-9-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" The function _rtw_open_pktfile() is only used in rtw_xmit.c. Make it static. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 19 ++++++++++++++++++ drivers/staging/r8188eu/include/xmit_osdep.h | 1 - drivers/staging/r8188eu/os_dep/xmit_linux.c | 21 -------------------- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index eef1a27e84eb..6cf583fd9890 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -402,6 +402,25 @@ u8 qos_acm(u8 acm_mask, u8 priority) return change_priority; } =20 +static void _rtw_open_pktfile(struct sk_buff *pktptr, struct pkt_file *pfi= le) +{ + if (!pktptr) { + pr_err("8188eu: pktptr is NULL\n"); + return; + } + if (!pfile) { + pr_err("8188eu: pfile is NULL\n"); + return; + } + pfile->pkt =3D pktptr; + pfile->cur_addr =3D pktptr->data; + pfile->buf_start =3D pktptr->data; + pfile->pkt_len =3D pktptr->len; + pfile->buf_len =3D pktptr->len; + + pfile->cur_buffer =3D pfile->buf_start; +} + static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib) { struct ethhdr etherhdr; diff --git a/drivers/staging/r8188eu/include/xmit_osdep.h b/drivers/staging= /r8188eu/include/xmit_osdep.h index 2c663c00b985..2ecbe3f01aa8 100644 --- a/drivers/staging/r8188eu/include/xmit_osdep.h +++ b/drivers/staging/r8188eu/include/xmit_osdep.h @@ -30,7 +30,6 @@ struct xmit_buf; =20 int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); =20 -void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile); uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen); =20 void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt); diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/= r8188eu/os_dep/xmit_linux.c index 3d298d8187d2..c917024843a2 100644 --- a/drivers/staging/r8188eu/os_dep/xmit_linux.c +++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c @@ -17,27 +17,6 @@ static uint rtw_remainder_len(struct pkt_file *pfile) (size_t)(pfile->buf_start)); } =20 -void _rtw_open_pktfile(struct sk_buff *pktptr, struct pkt_file *pfile) -{ - - if (!pktptr) { - pr_err("8188eu: pktptr is NULL\n"); - return; - } - if (!pfile) { - pr_err("8188eu: pfile is NULL\n"); - return; - } - pfile->pkt =3D pktptr; - pfile->cur_addr =3D pktptr->data; - pfile->buf_start =3D pktptr->data; - pfile->pkt_len =3D pktptr->len; - pfile->buf_len =3D pktptr->len; - - pfile->cur_buffer =3D pfile->buf_start; - -} - uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen) { uint len =3D 0; --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 76FB7C25B08 for ; Sat, 20 Aug 2022 18:17:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232816AbiHTSR2 (ORCPT ); Sat, 20 Aug 2022 14:17:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231939AbiHTSQp (ORCPT ); Sat, 20 Aug 2022 14:16:45 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA56C31DF1 for ; Sat, 20 Aug 2022 11:16:43 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id j21so8868712ejs.0 for ; Sat, 20 Aug 2022 11:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=s0gG/Y/1ndpD2o1oxGib08M1iLWS4DAsSTix2vBGTk8=; b=M2RXBrxGosxefZjApl+IioG6a4nCIvHduh8TOb3I3CAhWA5L5dzlxxunsIHupAKtlK xSHNHS1FSH0OBvucqIvx0os9WtHmyVC9osOAPgHQ6xH4NWXs6KEZ+UoAwxJ1+BmmW4Iq wMNqqHD9978+9kVhDtrgEzfRT5TJfuMCiSaGixY2YGVawAI7z/PG+9JTWdsINeeizgCf 5bOnmpBG5qqJf4MuqNLDePGwvwgFj8qUj/4NSM1TLyMaz6CGBP9C11Ht8KbgK4ESQkAX thKa944IIf0bxhCIRQKhDogeV1JTCApDBHHDUP3GLTl5DRVYnGmfPyJNVkPb3qjOb3M7 muAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=s0gG/Y/1ndpD2o1oxGib08M1iLWS4DAsSTix2vBGTk8=; b=d48FUcyMQZrR4V3oNACyS0lUT94yR8c+BocQbxbuqyyz9mQJZryTqLvDXkHX37huVm dL9bG3skX0fL4dDENh8sBB6mtA4dlr7Nqyi+7Iwx/eXbmsBKgeIEvafFINn1Yz7VCHWD fpnShKQxCdc23yrLM1tL7TOf8M1LV+Etd/+E7eUhyPjlk4I6d59ql6fsxZGFMFPykPrN sbQ+p0tRT/emFe4UgpW6g8ZroeSBh4Ku2o7SlozRhd+8jZQoe89pzTTNXP6I5XR6hP/i /pdsqxzp58E8R3MAZZcAUcOTOUcrkilItovF+UPnA/ph/yJTSiH1Hyxw51dCnU24vFvO k2/A== X-Gm-Message-State: ACgBeo0GKP4kz3Rj5JzG7epk0yXMOImFGxICheiZWIvYRZe7ZXpb5f6A 4VSDFqPOdeKfQTZqqjXnHVM= X-Google-Smtp-Source: AA6agR4bSIwh1Gf2i4Zy7jyo/bQXpTCoLOr3MSn19rbIti5YB1LQUFIxTIflcmokDYeJqqz0lZIg4g== X-Received: by 2002:a17:906:7955:b0:73c:20e7:86cb with SMTP id l21-20020a170906795500b0073c20e786cbmr7545875ejo.527.1661019402457; Sat, 20 Aug 2022 11:16:42 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16:42 -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 09/19] staging: r8188eu: rename _rtw_open_pktfile() Date: Sat, 20 Aug 2022 20:16:13 +0200 Message-Id: <20220820181623.12497-10-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" There is no need to prefix the function name of _rtw_open_pktfile() with an underscore. Rename it to rtw_open_pktfile(). Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 6cf583fd9890..caacf35485dd 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -402,7 +402,7 @@ u8 qos_acm(u8 acm_mask, u8 priority) return change_priority; } =20 -static void _rtw_open_pktfile(struct sk_buff *pktptr, struct pkt_file *pfi= le) +static void rtw_open_pktfile(struct sk_buff *pktptr, struct pkt_file *pfil= e) { if (!pktptr) { pr_err("8188eu: pktptr is NULL\n"); @@ -427,7 +427,7 @@ static void set_qos(struct pkt_file *ppktfile, struct p= kt_attrib *pattrib) struct iphdr ip_hdr; s32 user_prio =3D 0; =20 - _rtw_open_pktfile(ppktfile->pkt, ppktfile); + rtw_open_pktfile(ppktfile->pkt, ppktfile); _rtw_pktfile_read(ppktfile, (unsigned char *)ðerhdr, ETH_HLEN); =20 /* get user_prio from IP hdr */ @@ -461,7 +461,7 @@ static s32 update_attrib(struct adapter *padapter, stru= ct sk_buff *pkt, struct p =20 =20 =20 - _rtw_open_pktfile(pkt, &pktfile); + rtw_open_pktfile(pkt, &pktfile); _rtw_pktfile_read(&pktfile, (u8 *)ðerhdr, ETH_HLEN); =20 pattrib->ether_type =3D ntohs(etherhdr.h_proto); @@ -940,7 +940,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, st= ruct sk_buff *pkt, struct goto exit; } =20 - _rtw_open_pktfile(pkt, &pktfile); + rtw_open_pktfile(pkt, &pktfile); _rtw_pktfile_read(&pktfile, NULL, pattrib->pkt_hdrlen); =20 frg_inx =3D 0; --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 66F29C25B08 for ; Sat, 20 Aug 2022 18:17:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233529AbiHTSRZ (ORCPT ); Sat, 20 Aug 2022 14:17:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231917AbiHTSQo (ORCPT ); Sat, 20 Aug 2022 14:16:44 -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 75DF631DE2 for ; Sat, 20 Aug 2022 11:16:43 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id t5so9131356edc.11 for ; Sat, 20 Aug 2022 11:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=+p+/p6KYk7k3LZ2p6BJMyqG+n93UeRxNU/hjU7tSF4s=; b=D3jOoPFLSWHyqBKWqPcy07BrdDFj+btHZBVi72MNmRufXF90atV2oUGdcZ0I7w9jEZ XU57n6TaqEDoEZmNd76ciNhmAFPvWQXDIwNcS33TQFi8NRIiFN8BC61By2GGXkLQNbve vL56OO1c3y341trKkufktZCQQ7YMzXJ/oVdSrXlqmvKOz5acN/T7uNq1QvzxYRgIKzRW /6O4FHZ2xTQFlRoT+kbKbG+XJE9OLbw0UbatEjBj3zHCagGB7WjzS0AgjWHVtPGPjH2d s6kp1E8roqLYPtMQZZ1WPTe/KEYs78t2jGp4P5zJvr12ZnTTULezJEmdjwqrklkOpnzp Ac5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=+p+/p6KYk7k3LZ2p6BJMyqG+n93UeRxNU/hjU7tSF4s=; b=ZJrm6LjyA9jvpll2NLNzSSubtq2QF6EbLBLgRev3Ta9jZKQ2esf0LMct2KPplxXvJj dDqGvQVZfDLt4glrc1A7KCtYJHXXIf+YSwH+zwVcwgKn3w/mL6tiqadNbzUJrDeAIFDd 1ZrjX/hwcp6T5UBYvMA0wu3eM7aLcer6dEz46Rat6QFzFGmBiBQ5oGGMp2Z0e++hq1EH 95Fr7c1ilBDEJUiXQP2vBe+pX3SMEhFLU0YGc9NUBbMlnnWXFT22tyZTKcIMgwzTT8AM I0FpSC3u9CbTQj87lyM0WbLnpoScj3Ie3hdC77c8MefWFHdyuJHfQRUl+QlbFox1eDYl lBdA== X-Gm-Message-State: ACgBeo2nNtbBpNuRjAmr/nLXBIv7ETwMWlllQHzlE5nVcg5UR/EKP0To vB3o5FiWPlvYP1SOJC4If3U= X-Google-Smtp-Source: AA6agR4l7Rg0O7B+/EcNEM3BgwwyFTot6LkvhHoV7dmhSZN3TF+RSCplyzVTJUZ4qLaBdmQhvPvvzA== X-Received: by 2002:a05:6402:4313:b0:446:7ce9:c2a1 with SMTP id m19-20020a056402431300b004467ce9c2a1mr2395547edc.288.1661019403067; Sat, 20 Aug 2022 11:16:43 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16:42 -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 10/19] staging: r8188eu: make _rtw_pktfile_read() static Date: Sat, 20 Aug 2022 20:16:14 +0200 Message-Id: <20220820181623.12497-11-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" The function _rtw_pktfile_read() is only used in rtw_xmit.c. Make it static. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 22 ++++++++++++++++++++ drivers/staging/r8188eu/include/xmit_osdep.h | 2 -- drivers/staging/r8188eu/os_dep/xmit_linux.c | 22 -------------------- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index caacf35485dd..26bf300e672b 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -421,6 +421,28 @@ static void rtw_open_pktfile(struct sk_buff *pktptr, s= truct pkt_file *pfile) pfile->cur_buffer =3D pfile->buf_start; } =20 +static uint rtw_remainder_len(struct pkt_file *pfile) +{ + return pfile->buf_len - ((size_t)(pfile->cur_addr) - + (size_t)(pfile->buf_start)); +} + +static uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen) +{ + uint len =3D 0; + + len =3D rtw_remainder_len(pfile); + len =3D (rlen > len) ? len : rlen; + + if (rmem) + skb_copy_bits(pfile->pkt, pfile->buf_len - pfile->pkt_len, rmem, len); + + pfile->cur_addr +=3D len; + pfile->pkt_len -=3D len; + + return len; +} + static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib) { struct ethhdr etherhdr; diff --git a/drivers/staging/r8188eu/include/xmit_osdep.h b/drivers/staging= /r8188eu/include/xmit_osdep.h index 2ecbe3f01aa8..bcecf0bb2b18 100644 --- a/drivers/staging/r8188eu/include/xmit_osdep.h +++ b/drivers/staging/r8188eu/include/xmit_osdep.h @@ -30,8 +30,6 @@ struct xmit_buf; =20 int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); =20 -uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen); - void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt); void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe); diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/= r8188eu/os_dep/xmit_linux.c index c917024843a2..e216ada44055 100644 --- a/drivers/staging/r8188eu/os_dep/xmit_linux.c +++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c @@ -11,28 +11,6 @@ #include "../include/osdep_intf.h" #include "../include/usb_osintf.h" =20 -static uint rtw_remainder_len(struct pkt_file *pfile) -{ - return pfile->buf_len - ((size_t)(pfile->cur_addr) - - (size_t)(pfile->buf_start)); -} - -uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen) -{ - uint len =3D 0; - - len =3D rtw_remainder_len(pfile); - len =3D (rlen > len) ? len : rlen; - - if (rmem) - skb_copy_bits(pfile->pkt, pfile->buf_len - pfile->pkt_len, rmem, len); - - pfile->cur_addr +=3D len; - pfile->pkt_len -=3D len; - - return len; -} - #define WMM_XMIT_THRESHOLD (NR_XMITFRAME * 2 / 5) =20 void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt) --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 2AA67C25B08 for ; Sat, 20 Aug 2022 18:17:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233176AbiHTSRd (ORCPT ); Sat, 20 Aug 2022 14:17:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231398AbiHTSQq (ORCPT ); Sat, 20 Aug 2022 14:16:46 -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 5406E30F64 for ; Sat, 20 Aug 2022 11:16:45 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id t5so9131369edc.11 for ; Sat, 20 Aug 2022 11:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=tlMFx2z0JvLnlziapMufzUhDKuW3EwLTT6t3dqkzUYs=; b=QiXUYODOT64yakclYO6S8gLkVQ6g5lz4PJ1CZvM7CvggGkJbRDBczDrfv0+wiYx9Bi Ec8NdlIPgNC1n2g0AhUlK268Uecvfqv2mGDzP1/tQoN08kcuqqUrIkOWfrnebjnDMHVk H04cLaT31VaYu3DV9J6Lz7Yl2UWdCQhLwzyVy5YK1sD/b4zsFPmVz9qXF7MwHVJ7Mqdr BpL13pt//ZRiHFM760XtR4Z7868WFpR64/uDrQkTyEuxhHZ8jGjsECVQMnRtHOhjkzd0 f/gH/gD9KdN82rlclguJYN5L2dz8kSwnX1NF0f5F3DgsbqSoMXJQiyo5pkwcKG2y44Im c8xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=tlMFx2z0JvLnlziapMufzUhDKuW3EwLTT6t3dqkzUYs=; b=fBLvIRat78bhoLnJXlYBwXOMtqQa5l3y2PV3/c1/LlF7cY3mWkOSyLiKEfdnoiKwDk JNW0JGkMp3O7KA3LsMktPnAQ0SS/LNJ406eSUltdX4048Ei7BkHsKaeJLK+L21WyUpr/ 41A9UeaMkuj7GVErs+T7sU8WH+N8MCg9XjbSRpjkVAFWiLzD/xz+VJW9N91LyT2if4Wt 129bcsR05ivipbm1iVnQA9VSRUQ/Xoi61hZRmxm0Nsjj4qayOsNRlSK72ouQyrTo2Ypf p2Kd1bexQ32wczDg6++9uWy2ZtSYk/hoFBWUIoQW9vH6Ilk2mAxbqvd1W7R0fkZ34u5U jz/w== X-Gm-Message-State: ACgBeo3H86/w63vdNIWTJVzvqS+7egpTKchp2G4Ch27yIjrQaXL89oEe 8j8R0viDDc9UamhXMN1ueaU= X-Google-Smtp-Source: AA6agR6I6IJYWnxPzBp2530EXNKAgGiNN8Ww81N5ix3KRcfivHZtsfooZ6C+kcj6P7sWwtrPc1zZ/g== X-Received: by 2002:a05:6402:350e:b0:446:145d:a3bb with SMTP id b14-20020a056402350e00b00446145da3bbmr10066463edd.23.1661019403855; Sat, 20 Aug 2022 11:16:43 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16:43 -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 11/19] staging: r8188eu: rename _rtw_pktfile_read() Date: Sat, 20 Aug 2022 20:16:15 +0200 Message-Id: <20220820181623.12497-12-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" There is no need to prefix the function name of _rtw_pktfile_read() with an underscore. Rename it to rtw_pktfile_read(). Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 26bf300e672b..51672984156b 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -427,7 +427,7 @@ static uint rtw_remainder_len(struct pkt_file *pfile) (size_t)(pfile->buf_start)); } =20 -static uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen) +static uint rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen) { uint len =3D 0; =20 @@ -450,11 +450,11 @@ static void set_qos(struct pkt_file *ppktfile, struct= pkt_attrib *pattrib) s32 user_prio =3D 0; =20 rtw_open_pktfile(ppktfile->pkt, ppktfile); - _rtw_pktfile_read(ppktfile, (unsigned char *)ðerhdr, ETH_HLEN); + rtw_pktfile_read(ppktfile, (unsigned char *)ðerhdr, ETH_HLEN); =20 /* get user_prio from IP hdr */ if (pattrib->ether_type =3D=3D 0x0800) { - _rtw_pktfile_read(ppktfile, (u8 *)&ip_hdr, sizeof(ip_hdr)); + rtw_pktfile_read(ppktfile, (u8 *)&ip_hdr, sizeof(ip_hdr)); /* user_prio =3D (ntohs(ip_hdr.tos) >> 5) & 0x3; */ user_prio =3D ip_hdr.tos >> 5; } else if (pattrib->ether_type =3D=3D 0x888e) { @@ -484,7 +484,7 @@ static s32 update_attrib(struct adapter *padapter, stru= ct sk_buff *pkt, struct p =20 =20 rtw_open_pktfile(pkt, &pktfile); - _rtw_pktfile_read(&pktfile, (u8 *)ðerhdr, ETH_HLEN); + rtw_pktfile_read(&pktfile, (u8 *)ðerhdr, ETH_HLEN); =20 pattrib->ether_type =3D ntohs(etherhdr.h_proto); =20 @@ -512,7 +512,7 @@ static s32 update_attrib(struct adapter *padapter, stru= ct sk_buff *pkt, struct p /* to prevent DHCP protocol fail */ u8 tmp[24]; =20 - _rtw_pktfile_read(&pktfile, &tmp[0], 24); + rtw_pktfile_read(&pktfile, &tmp[0], 24); pattrib->dhcp_pkt =3D 0; if (pktfile.pkt_len > 282) {/* MINIMUM_DHCP_PACKET_SIZE) { */ if (((tmp[21] =3D=3D 68) && (tmp[23] =3D=3D 67)) || @@ -963,7 +963,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, st= ruct sk_buff *pkt, struct } =20 rtw_open_pktfile(pkt, &pktfile); - _rtw_pktfile_read(&pktfile, NULL, pattrib->pkt_hdrlen); + rtw_pktfile_read(&pktfile, NULL, pattrib->pkt_hdrlen); =20 frg_inx =3D 0; frg_len =3D pxmitpriv->frag_len - 4;/* 2346-4 =3D 2342 */ @@ -1021,9 +1021,9 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, = struct sk_buff *pkt, struct =20 if (bmcst) { /* don't do fragment to broadcast/multicast packets */ - mem_sz =3D _rtw_pktfile_read(&pktfile, pframe, pattrib->pktlen); + mem_sz =3D rtw_pktfile_read(&pktfile, pframe, pattrib->pktlen); } else { - mem_sz =3D _rtw_pktfile_read(&pktfile, pframe, mpdu_len); + mem_sz =3D rtw_pktfile_read(&pktfile, pframe, mpdu_len); } =20 pframe +=3D mem_sz; --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 1FB87C25B08 for ; Sat, 20 Aug 2022 18:17:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234341AbiHTSRm (ORCPT ); Sat, 20 Aug 2022 14:17:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231965AbiHTSQq (ORCPT ); Sat, 20 Aug 2022 14:16:46 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 017B430F71 for ; Sat, 20 Aug 2022 11:16:46 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id t5so9131383edc.11 for ; Sat, 20 Aug 2022 11:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=GZU6i7aDhQpE9Y4RDqbtXF3Z4a0g0R6IbiFmWRA8yYM=; b=KL6nER2nrF3su/u53V4e/nPH8TwgstfI7LTmxj9kEuH2LZvGlFTMY7xbnu5k/IS6gC 2QkMIapsaXz8ygipyYvpAefCe/2XagtRSC7difoSWdnt+Z2Z5vn+dv/522YfpBSbEEZd mrvWfFfYFRnT9x1X5cylXTfszqVzqsvQtVgfM7aLWm91oe7l5ony9Ca5XaX3i86vy9wn HA7+lCz2a3pO1CcNZf+hw+kqbEFruVHkIBK9W9UzgnVhjf/6jzRCI6tKz3KOWxKo0CRh a189231pKGValY0cXoxWzEduJXA8069MVcOX66u7uqeBF7BZJwe8wdi7aMYPHeLLfb7C gRhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=GZU6i7aDhQpE9Y4RDqbtXF3Z4a0g0R6IbiFmWRA8yYM=; b=kURDmf5ui2rJsx4+S9SEDLq4MhEbUgbyi4VWTvqjbJqF8dt+X5MxFqD8s1HfmYP7R3 OL6xckVZd8pGbDIryK73yiCSvao73sCa6EoRDyOKrxnCz4UFTtIOumZArgiOxBOx80k8 1Q6rLixscGYa7+QKc6zLGqRexbvKQiPZCPgE5Tb1nsYAqbIWZ3AQMePa2xo98K2r0D1i 1xpuR5BJv0dsnnlaLuqYweVvinm7XiozhjIHo4MJqoQeACbpFc2hc0Bw+PD6vG25X1g8 pL6QCjoJiEKZEqssa3rDTWbyAQy25MQHFRwJxDHgFldhwWOhMzoKJZOgECCh71W9ZL3h +Wcw== X-Gm-Message-State: ACgBeo2OJB9F3alD398WswRe43bsSjGc/otMO86x6pXoTh/Bo7PxenzZ gSceLwfJbazxFKGji7w3FlU= X-Google-Smtp-Source: AA6agR6oLVTY6qUsqCtwJ6uLznILUKKMYi6isg2sqEFLxh10zLVCr3PFa8YEiYu2OwIDQSa3929V5w== X-Received: by 2002:a05:6402:5212:b0:446:6910:5549 with SMTP id s18-20020a056402521200b0044669105549mr3632612edd.345.1661019404495; Sat, 20 Aug 2022 11:16:44 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16:44 -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 12/19] staging: r8188eu: remove unnecessary initialization to zero Date: Sat, 20 Aug 2022 20:16:16 +0200 Message-Id: <20220820181623.12497-13-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" The initialization to zero of the variable 'len' in rtw_pktfile_read() is not needed. It is immediately set to another value. Remove the initialization to zero. While at it, remove an extra space. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 51672984156b..f79889011cd1 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -429,9 +429,9 @@ static uint rtw_remainder_len(struct pkt_file *pfile) =20 static uint rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen) { - uint len =3D 0; + uint len; =20 - len =3D rtw_remainder_len(pfile); + len =3D rtw_remainder_len(pfile); len =3D (rlen > len) ? len : rlen; =20 if (rmem) --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 6FB59C25B08 for ; Sat, 20 Aug 2022 18:17:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234217AbiHTSRi (ORCPT ); Sat, 20 Aug 2022 14:17:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232185AbiHTSQv (ORCPT ); Sat, 20 Aug 2022 14:16:51 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 983DE31DCB for ; Sat, 20 Aug 2022 11:16:46 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id a22so9134499edj.5 for ; Sat, 20 Aug 2022 11:16:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=+gbZ+oN4SNG8rEc+ME/YtcZCnc3X1ePwf/x65RNZ3kM=; b=BYZya6PP+0hwGkgRVKYMSNMHtfJxzJNgNXJCkJuXFR/ELJZ2PgABp0Sn/DYTU+7NGW GT9/YKIWzsuWjUVvjCLL2FJA+/k5ZHuxAG8DsVdz+/Ba95l93eWcJ6pfyW5RLDQ+dD+h dI0NjeplNbn7qM9Ql4RasukxulLInv5PjQ0LHO7R3zxyp262TxKAjJQSLBVDmpanG++U Y6lBSuFzdo7jejWgwxHwY5AXE+KZtIcd43Dh4v+3gQ471Ggxx3ElwfCSW6DLbddHFKwd SC7c/XhPoDGMUKa1ULhXhBRdmxS7j4nRrdNXZ5GQ6uN81aVHA4J26HnCm6tm2VJAjNz9 7WxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=+gbZ+oN4SNG8rEc+ME/YtcZCnc3X1ePwf/x65RNZ3kM=; b=FedY9WVNvj3+EgatMYZz0zPgi/ZzHlr97pXtmsnsnjqcjXGUB0QyojsPev+NJPWu10 BU3aX34/A+OGMzyL1SN5z6UEAiXNgeSVza8AgC8AVrooZEuw/XqzzHeusK7yjdo6BxP3 1MTc0n3W7JTuGfBUOQrURsa2NPF0TNn687F+vDVK35APLOFGAveUW8q82lWvhYzfAP2w pjQNSPxtfGFffYMB/EH134CImI1sZY7mn09UTY3sFob+5NYOsJfcqNwefLQ877Kx48zb VLJVTfMfEmsX3ny4rxH2KffY3W55RIeYkvb9/yUi5dWcTpnQyBt3RArWOnBN/6YNJXdt rYvw== X-Gm-Message-State: ACgBeo04HTgDb06TIIRAwWtkZ+L0ggNjOH0t5M6u9achZzhAt9QMHqCc buFPLaJsyB866xBNx5MWEjI= X-Google-Smtp-Source: AA6agR51MlTVkECMOkCcfSBY/eKRePWM2JMEl8QhB9bsKxUbI9ainFG0dFWvrfWTo1X0qGZRso32ow== X-Received: by 2002:a05:6402:451:b0:446:7349:f9e8 with SMTP id p17-20020a056402045100b004467349f9e8mr3043070edw.180.1661019405215; Sat, 20 Aug 2022 11:16:45 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16:44 -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 13/19] staging: r8188eu: move struct pkt_file to rtw_xmit.h Date: Sat, 20 Aug 2022 20:16:17 +0200 Message-Id: <20220820181623.12497-14-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" The code that uses struct pkt_file has been moved to rtw_xmit.c. Move the structure definition to rtw_xmit.h. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/include/rtw_xmit.h | 9 +++++++++ drivers/staging/r8188eu/include/xmit_osdep.h | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r= 8188eu/include/rtw_xmit.h index 034a9f8f51c9..0e9471fb19e4 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -304,6 +304,15 @@ struct xmit_priv { struct submit_ctx ack_tx_ops; }; =20 +struct pkt_file { + struct sk_buff *pkt; + size_t pkt_len; /* the remainder length of the open_file */ + unsigned char *cur_buffer; + u8 *buf_start; + u8 *cur_addr; + size_t buf_len; +}; + struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv); s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); diff --git a/drivers/staging/r8188eu/include/xmit_osdep.h b/drivers/staging= /r8188eu/include/xmit_osdep.h index bcecf0bb2b18..612cdab52a9f 100644 --- a/drivers/staging/r8188eu/include/xmit_osdep.h +++ b/drivers/staging/r8188eu/include/xmit_osdep.h @@ -7,15 +7,6 @@ #include "osdep_service.h" #include "drv_types.h" =20 -struct pkt_file { - struct sk_buff *pkt; - size_t pkt_len; /* the remainder length of the open_file */ - unsigned char *cur_buffer; - u8 *buf_start; - u8 *cur_addr; - size_t buf_len; -}; - extern int rtw_ht_enable; extern int rtw_cbw40_enable; extern int rtw_ampdu_enable;/* for enable tx_ampdu */ --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 13789C25B08 for ; Sat, 20 Aug 2022 18:17:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234512AbiHTSRr (ORCPT ); Sat, 20 Aug 2022 14:17:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232230AbiHTSQw (ORCPT ); Sat, 20 Aug 2022 14:16:52 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8780C31EEE for ; Sat, 20 Aug 2022 11:16:47 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id gb36so14214554ejc.10 for ; Sat, 20 Aug 2022 11:16:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=c5ehAN+V6o0UyrUy4MpXxQSXfN8Q8ckg1hQmpn4R19w=; b=KSqi7rl4+1guhMKdYi9+VP4e2YDJqZXP5I7clqBORFVSYNA81f/iK7jIIUlMa2u9Qe WprQl1RL/KmOfk+8tRf0dYwIawmTrp2Vvtboie7OUNkzuoyGIcfarw267CgF89C9uwf1 WsDzBKAv5dcPfFzhO/iRW+MTeWBrP/iG9XvAZ/LeTMxfctB2Vw7vsMYA79WZd2KggGde 7XjhkapIFHDyIh3dHqVvVZE17TiBUThobPaymVp3KgSK9pYfIyhJZmSX+AkTu00kLk8+ aLxuT5oM3rWMA8ev9N0LBXHPMoUZQH5+uxuzrme1t2Hxy/NWYOxiX9a6YQdHvT48QRxq HhIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=c5ehAN+V6o0UyrUy4MpXxQSXfN8Q8ckg1hQmpn4R19w=; b=Xdo172CbH+PYUaCZn5b4mDdgjlKxlcwNoeo5oOeXmVaI+7WgiDkPIbd79I5DZoSizj wCzyrK3Utd9ScvPTEuYJiEZQ1cI1K8tjSl+JzEZiJR1/zvA2lHdrfalK4b1OcezLJ2x1 WFVA/XXiPGwnrdaoGtWoKNnLoi+R4E+YhR4aDSNLP8TvJDs5QyYRJyDw9YTf4Vb5Gzhc /huHV1QeAGESxZxkMVHA3qFTneocWrG26IL0ZruVRlBPkRsFqcfnilNz5Zc9vfWEO2Q9 0937rqQfBgHAyCmVyiv15W1EoSuRxJa3yLAvgfLGtnYCqyY1nUEX18Q3xdWOJNeXNzzl AD+A== X-Gm-Message-State: ACgBeo0OkiStr+RkuA+7GxZugYpHjtWatg/+LDg3ItIHdkcQYERAjIt8 DqPMO2cp2Ud8eB5gQqt7wKo= X-Google-Smtp-Source: AA6agR7XGHClFKK38cuEgOKG3DAOv6Day3RPsKs1rVd7WUs7R9RGWljq6EMW+cjz/XGY2ozz9nf8Og== X-Received: by 2002:a17:907:94d0:b0:730:7a68:3093 with SMTP id dn16-20020a17090794d000b007307a683093mr8687137ejc.760.1661019406059; Sat, 20 Aug 2022 11:16:46 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16:45 -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 14/19] staging: r8188eu: move rtw_os_xmit_complete() to rtw_xmit.c Date: Sat, 20 Aug 2022 20:16:18 +0200 Message-Id: <20220820181623.12497-15-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" Move the function rtw_os_xmit_complete() from the os_dep/xmit_linux.c to core/rtw_xmit.c. The goal is to get rid of os_dep/xmit_linux.c in follow up patches. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 7 +++++++ drivers/staging/r8188eu/include/rtw_xmit.h | 2 ++ drivers/staging/r8188eu/include/xmit_osdep.h | 2 -- drivers/staging/r8188eu/os_dep/xmit_linux.c | 7 ------- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index f79889011cd1..d5878b31bdbb 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -229,6 +229,13 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, s= truct adapter *padapter) return res; } =20 +void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxf= rame) +{ + if (pxframe->pkt) + rtw_os_pkt_complete(padapter, pxframe->pkt); + pxframe->pkt =3D NULL; +} + void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) { int i; diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r= 8188eu/include/rtw_xmit.h index 0e9471fb19e4..0c46b19d2842 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -364,6 +364,8 @@ u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe); int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms); void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status); =20 +void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxf= rame); + /* include after declaring struct xmit_buf, in order to avoid warning */ #include "xmit_osdep.h" =20 diff --git a/drivers/staging/r8188eu/include/xmit_osdep.h b/drivers/staging= /r8188eu/include/xmit_osdep.h index 612cdab52a9f..b881399fd989 100644 --- a/drivers/staging/r8188eu/include/xmit_osdep.h +++ b/drivers/staging/r8188eu/include/xmit_osdep.h @@ -22,7 +22,5 @@ struct xmit_buf; int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); =20 void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt); -void rtw_os_xmit_complete(struct adapter *padapter, - struct xmit_frame *pxframe); =20 #endif /* __XMIT_OSDEP_H_ */ diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/= r8188eu/os_dep/xmit_linux.c index e216ada44055..d67508096209 100644 --- a/drivers/staging/r8188eu/os_dep/xmit_linux.c +++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c @@ -31,13 +31,6 @@ void rtw_os_pkt_complete(struct adapter *padapter, struc= t sk_buff *pkt) dev_kfree_skb_any(pkt); } =20 -void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxf= rame) -{ - if (pxframe->pkt) - rtw_os_pkt_complete(padapter, pxframe->pkt); - pxframe->pkt =3D NULL; -} - static void rtw_check_xmit_resource(struct adapter *padapter, struct sk_bu= ff *pkt) { struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 8930AC25B08 for ; Sat, 20 Aug 2022 18:18:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233745AbiHTSSE (ORCPT ); Sat, 20 Aug 2022 14:18:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232292AbiHTSQw (ORCPT ); Sat, 20 Aug 2022 14:16:52 -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 3A243326C9 for ; Sat, 20 Aug 2022 11:16:48 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id u6so4068236eda.12 for ; Sat, 20 Aug 2022 11:16:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=yjcPgw0CG7/5/Itv9oWRmuj8uNx0y9j81u7fcqrcyG8=; b=fKY56u27nZCdc2CpciMfhjUjjFmX1muPxps4Tl6+riE/nFQcGjUrmjWc+rmd3mRjQJ p9pVfNHdz1Oq7qO5gsHMbLFSOmCxrPlwBZEhNwNr+oO+gCya3XFkA0+Nit8KsXLoXa8l 6PYTBWeBqz9/vLV7E3hBNFx6eD/CWR1vzCg6K+eh8XJn3b1arvdSspqY5rdbsbxJPMr8 jDY8N41Tti3CXcb4XU6Dt3y+bVC/OtrmRTsVHz9QPHNEt20GTrKF4rDgwcimK4HxogsL XIh+xZLC9uP7Wv/Srvb5SCm3Xv0zO9mUya0bLv8Sl9Onhrv7+AHfiKy/RdWPUPXV/aB2 bgHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=yjcPgw0CG7/5/Itv9oWRmuj8uNx0y9j81u7fcqrcyG8=; b=MgOFt/L9hGIhsvEnPXIvC4LE4rJE2+jZp763PwiaGcXSBFVlSRgaHEUtxhjwVLdzrx dAEhIuE1ttfinh7xkCSIU+q+skCQnLifTes8OKNQqTCwwp8g0mgQbL7Kcsnwi78zptsD 9tmkwfPBD5RKO0V3ygzIAJSpUdb/tD/f75Gs27VIuJiB2ZCKKVJYJDdahzuAUnikqppX J9WrKyagrpakGjcnILzTaqOMoM2NGloMpXxb6QeeU0/Cbby/1ECpoYZOn6GJr844R3MG GzDV5a4ue+Hka2gpHGisZPg8/jhvdu6Q5dgXPBZUgz4j/sH8GqKu4hLLuU/qVwIdI+GK uOQw== X-Gm-Message-State: ACgBeo2uLAkH8r7XpS1/yvyztqzN61gp1hL1N8QE20Zg2LHmtPFhLn5A uM4k7j+88MmcRA1Duzimfs8= X-Google-Smtp-Source: AA6agR4Ib7WAPazC9WU6QZ/34Vv3a4iM92Pw2z6TiPCIbiX2j8NhLkrvDizzG97CDrxkJXAI6OWfFQ== X-Received: by 2002:a05:6402:510a:b0:43d:ab25:7d68 with SMTP id m10-20020a056402510a00b0043dab257d68mr10111339edd.102.1661019406769; Sat, 20 Aug 2022 11:16:46 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16:46 -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 15/19] staging: r8188eu: rename rtw_os_xmit_complete() Date: Sat, 20 Aug 2022 20:16:19 +0200 Message-Id: <20220820181623.12497-16-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" The function rtw_os_xmit_complete() was moved from the os_dep directory. It looks like the driver was originaly written to support different operating systems. Obviously we do not need an extra 'os' in the function name that indicates that the function is operating system specific. Rename it to rtw_xmit_complete(). Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/core/rtw_xmit.c | 10 +++++----- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 4 ++-- drivers/staging/r8188eu/include/rtw_xmit.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 3103e8871dfd..893dac30e8e6 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -7876,7 +7876,7 @@ u8 tx_beacon_hdl(struct adapter *padapter, unsigned c= har *pbuf) =20 spin_unlock_bh(&psta_bmc->sleep_q.lock); if (rtl8188eu_hal_xmit(padapter, pxmitframe)) - rtw_os_xmit_complete(padapter, pxmitframe); + rtw_xmit_complete(padapter, pxmitframe); spin_lock_bh(&psta_bmc->sleep_q.lock); } spin_unlock_bh(&psta_bmc->sleep_q.lock); diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index d5878b31bdbb..760b115938f2 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -229,7 +229,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) return res; } =20 -void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxf= rame) +void rtw_xmit_complete(struct adapter *padapter, struct xmit_frame *pxfram= e) { if (pxframe->pkt) rtw_os_pkt_complete(padapter, pxframe->pkt); @@ -249,7 +249,7 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) return; =20 for (i =3D 0; i < NR_XMITFRAME; i++) { - rtw_os_xmit_complete(padapter, pxmitframe); + rtw_xmit_complete(padapter, pxmitframe); =20 pxmitframe++; } @@ -2017,7 +2017,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, str= uct sta_info *psta) =20 spin_unlock_bh(&psta->sleep_q.lock); if (rtl8188eu_hal_xmit(padapter, pxmitframe)) - rtw_os_xmit_complete(padapter, pxmitframe); + rtw_xmit_complete(padapter, pxmitframe); spin_lock_bh(&psta->sleep_q.lock); } =20 @@ -2067,7 +2067,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, str= uct sta_info *psta) =20 spin_unlock_bh(&psta_bmc->sleep_q.lock); if (rtl8188eu_hal_xmit(padapter, pxmitframe)) - rtw_os_xmit_complete(padapter, pxmitframe); + rtw_xmit_complete(padapter, pxmitframe); spin_lock_bh(&psta_bmc->sleep_q.lock); } =20 @@ -2141,7 +2141,7 @@ void xmit_delivery_enabled_frames(struct adapter *pad= apter, struct sta_info *pst pxmitframe->attrib.triggered =3D 1; =20 if (rtl8188eu_hal_xmit(padapter, pxmitframe)) - rtw_os_xmit_complete(padapter, pxmitframe); + rtw_xmit_complete(padapter, pxmitframe); =20 if ((psta->sleepq_ac_len =3D=3D 0) && (!psta->has_legacy_ac) && (wmmps_a= c)) { pstapriv->tim_bitmap &=3D ~BIT(psta->aid); diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging= /r8188eu/hal/rtl8188eu_xmit.c index bdfa51949289..8e4a5acc0b18 100644 --- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c +++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c @@ -431,7 +431,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt= , struct xmit_priv *pxmit rtw_xmitframe_coalesce(adapt, pxmitframe->pkt, pxmitframe); =20 /* always return ndis_packet after rtw_xmitframe_coalesce */ - rtw_os_xmit_complete(adapt, pxmitframe); + rtw_xmit_complete(adapt, pxmitframe); =20 /* 3 2. aggregate same priority and same DA(AP or STA) frames */ pfirstframe =3D pxmitframe; @@ -501,7 +501,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt= , struct xmit_priv *pxmit =20 rtw_xmitframe_coalesce(adapt, pxmitframe->pkt, pxmitframe); /* always return ndis_packet after rtw_xmitframe_coalesce */ - rtw_os_xmit_complete(adapt, pxmitframe); + rtw_xmit_complete(adapt, pxmitframe); =20 /* (len - TXDESC_SIZE) =3D=3D pxmitframe->attrib.last_txcmdsz */ update_txdesc(pxmitframe, pxmitframe->buf_addr, pxmitframe->attrib.last_= txcmdsz, true); diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r= 8188eu/include/rtw_xmit.h index 0c46b19d2842..2475ca084265 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -364,7 +364,7 @@ u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe); int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms); void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status); =20 -void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxf= rame); +void rtw_xmit_complete(struct adapter *padapter, struct xmit_frame *pxfram= e); =20 /* include after declaring struct xmit_buf, in order to avoid warning */ #include "xmit_osdep.h" --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 087A3C25B08 for ; Sat, 20 Aug 2022 18:17:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234880AbiHTSR4 (ORCPT ); Sat, 20 Aug 2022 14:17:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231768AbiHTSQw (ORCPT ); Sat, 20 Aug 2022 14:16:52 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6E5E31DC2 for ; Sat, 20 Aug 2022 11:16:48 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id gk3so14242468ejb.8 for ; Sat, 20 Aug 2022 11:16:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=d7bVOfCwv38NGS3uojI4ID7MCNpzdtxiQF4QB74ZMD4=; b=UYyKB/kBaw4qD9DK4I9upqnlygYOxag0a1k8bYxMd61BnvaCPFhrfDynI0xN6qAJ+I QTQ+aeS20x1RUZ8q1yX+GRvo4KpvQ562Ux3bObFkYYnLdSzj6OSn+1BtTBhC56DVmO8Z Yz0gzNKGriVjCjFae686jH5vce2j3+EfIiSLvMhAxfOYEDj6ur7BL/wyScXohTd546b5 YHr2Bgce6hrscxmwb1l2F/4NEJmpt1IYBnsmRWqKXfj4BTN7itj7AzcvVoeisZzcVe7B yV+dEZn9TCL6YD1unFjpK5OvKlgZnFyyLJJAkVbCO9nnRRAWR4SPzUtFIEgQyyAmiGv1 NTcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=d7bVOfCwv38NGS3uojI4ID7MCNpzdtxiQF4QB74ZMD4=; b=AI99gIwK6qDeXsMH0OW7SFuwkbeDJLtbMfP+8wvJM294VL5XZd+k44gG1k8AspN+nG 4P2OZNzgb/jy8IG6UTekcbB9/1xkmGwTZpqwHxDnQ0Nh2505SdLPoOIurCgIfYaPGRg8 IzMn3UGFtyerYn03Sj+kssGZdo23P9GgNs1rZAFQVnYbgkrKoeZ3lclVP4XD0NJJ8FYR zmPMEz5JpAncnTTROngwgKrf1KWFbkXzrWqSZq3Gz4AUIA/m+3EF7kj4RFIxo8vNvdh8 NfPe9CB1gQmc1Nw1NlLkotZf1iOEwX1c8XOR4mrq9pcXxWPHFrvpJfqdVYCIpr7+oaTd czxQ== X-Gm-Message-State: ACgBeo3yGj4LV6X7SsKBCJ6s263ySamBb54fI1WNTm8sqRgQa9dcRC0z KXBOMLLImHe/bX7Y2C5009k= X-Google-Smtp-Source: AA6agR6a6LwkzHTcgx9sxjTeQnpwtsR5LOaDUld8VDX9//JPP96UivEMCsKhLH4z8vjYZPz3BrZa7A== X-Received: by 2002:a17:906:93ef:b0:73c:cf83:5553 with SMTP id yl15-20020a17090693ef00b0073ccf835553mr5881014ejb.441.1661019407407; Sat, 20 Aug 2022 11:16:47 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16:47 -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 16/19] staging: r8188eu: make rtw_os_pkt_complete() static Date: Sat, 20 Aug 2022 20:16:20 +0200 Message-Id: <20220820181623.12497-17-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" The function rtw_os_pkt_complete() is only used in rtw_xmit.c. Make it static. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 18 ++++++++++++++++++ drivers/staging/r8188eu/include/rtw_xmit.h | 3 +++ drivers/staging/r8188eu/include/xmit_osdep.h | 4 ---- drivers/staging/r8188eu/os_dep/xmit_linux.c | 20 -------------------- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 760b115938f2..c324dada4f5b 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -229,6 +229,24 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, s= truct adapter *padapter) return res; } =20 +static void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *= pkt) +{ + u16 queue; + struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; + + queue =3D skb_get_queue_mapping(pkt); + if (padapter->registrypriv.wifi_spec) { + if (__netif_subqueue_stopped(padapter->pnetdev, queue) && + (pxmitpriv->hwxmits[queue].accnt < WMM_XMIT_THRESHOLD)) + netif_wake_subqueue(padapter->pnetdev, queue); + } else { + if (__netif_subqueue_stopped(padapter->pnetdev, queue)) + netif_wake_subqueue(padapter->pnetdev, queue); + } + + dev_kfree_skb_any(pkt); +} + void rtw_xmit_complete(struct adapter *padapter, struct xmit_frame *pxfram= e) { if (pxframe->pkt) diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r= 8188eu/include/rtw_xmit.h index 2475ca084265..be9a7afad8ea 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -7,6 +7,9 @@ #include "osdep_service.h" #include "drv_types.h" =20 +#define NR_XMITFRAME 256 +#define WMM_XMIT_THRESHOLD (NR_XMITFRAME * 2 / 5) + #define MAX_XMITBUF_SZ (20480) /* 20k */ #define NR_XMITBUFF (4) =20 diff --git a/drivers/staging/r8188eu/include/xmit_osdep.h b/drivers/staging= /r8188eu/include/xmit_osdep.h index b881399fd989..ae738d215e99 100644 --- a/drivers/staging/r8188eu/include/xmit_osdep.h +++ b/drivers/staging/r8188eu/include/xmit_osdep.h @@ -11,8 +11,6 @@ extern int rtw_ht_enable; extern int rtw_cbw40_enable; extern int rtw_ampdu_enable;/* for enable tx_ampdu */ =20 -#define NR_XMITFRAME 256 - struct xmit_priv; struct pkt_attrib; struct sta_xmit_priv; @@ -21,6 +19,4 @@ struct xmit_buf; =20 int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); =20 -void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt); - #endif /* __XMIT_OSDEP_H_ */ diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/= r8188eu/os_dep/xmit_linux.c index d67508096209..4721447a02e8 100644 --- a/drivers/staging/r8188eu/os_dep/xmit_linux.c +++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c @@ -11,26 +11,6 @@ #include "../include/osdep_intf.h" #include "../include/usb_osintf.h" =20 -#define WMM_XMIT_THRESHOLD (NR_XMITFRAME * 2 / 5) - -void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt) -{ - u16 queue; - struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; - - queue =3D skb_get_queue_mapping(pkt); - if (padapter->registrypriv.wifi_spec) { - if (__netif_subqueue_stopped(padapter->pnetdev, queue) && - (pxmitpriv->hwxmits[queue].accnt < WMM_XMIT_THRESHOLD)) - netif_wake_subqueue(padapter->pnetdev, queue); - } else { - if (__netif_subqueue_stopped(padapter->pnetdev, queue)) - netif_wake_subqueue(padapter->pnetdev, queue); - } - - dev_kfree_skb_any(pkt); -} - static void rtw_check_xmit_resource(struct adapter *padapter, struct sk_bu= ff *pkt) { struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 6A4BDC25B08 for ; Sat, 20 Aug 2022 18:18:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233509AbiHTSSA (ORCPT ); Sat, 20 Aug 2022 14:18:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232366AbiHTSQw (ORCPT ); Sat, 20 Aug 2022 14:16:52 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7171331ECA for ; Sat, 20 Aug 2022 11:16:49 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id y13so14212233ejp.13 for ; Sat, 20 Aug 2022 11:16:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=ASeCfCa+tsT6FZmVxdA2dZywHETG+qUcSgANszr5T+c=; b=ItXLh/FKjWL3zvhF3x5irPSa03abQC7PAZVqmbYfXX/Hr/sEb3kthYuOWyVf3e0mna hDiJOUE3kWfza8aeZxhJ7p5mf9UyFpD0VPqQYZq/g6QG3ArIWwHrYzn5JNwXFsw1Ya8X pYY3bjUXbV240mYrRVplrSMdVl0dub9q+PyUTo6kPCDyqDARma05xsJXGyPmBowlR4u0 NS7oz5izMD/q2vdp7+4Ho4c/EFQIxVeezxJktG7SnujSf0hIIUfXEMWeZJZw2AIIYYZc dYssj66iZbkJE5xauj8dfg30M+EBXEbt7kjaWkpYczFHkiCgji4QCLBPo+CcvtI1lR6Z C2Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=ASeCfCa+tsT6FZmVxdA2dZywHETG+qUcSgANszr5T+c=; b=ChyK4P9xgkNU+xK0cVpt1f8R65XiM6qyKDlgQzcWRy6KddyYXTJaVJIIO2shbnz/23 FnJNMF4NNBMwkKbN4extBa4g8io2tIDPO4oGJrJY1tAsJqTsyTsyd0ATItSjmJGLICnT elbqTTqjRnB1qdfI+oKS6ME+uVQS/nUhcW+V0EcV5j3lHleDO6bpK8bj1LMGwfcrv2YB OBX3lQy8eXojdCqh3Iy4+Gbvt2LTvxwSLnnlTvmE7G1BKNN38d7Y+ne3ujTqoiAB7Dw5 rjLcDQumjMsYS9BHrq+MQ1/lpnQOGvNlQ8yWharqRj/wEJOiN74Bp+2SWXqGzkYkY5O1 ssmw== X-Gm-Message-State: ACgBeo1dB6tuvU/s7HNHIYfYVxT4ROIOMVosHaxys9iqRKsV0TJ/WX5B YO8bgO4IUYTPHCyY2dj0BrQ= X-Google-Smtp-Source: AA6agR5S7xcNBdgyJebBooKqOm7QPNQNFF8xIBP1835Xq8l8ipZmklfEefRcIk2Ag1J8VPjicvNBsg== X-Received: by 2002:a17:906:b2d4:b0:731:4594:8ba1 with SMTP id cf20-20020a170906b2d400b0073145948ba1mr8461682ejb.288.1661019408032; Sat, 20 Aug 2022 11:16:48 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16:47 -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 17/19] staging: r8188eu: rename rtw_os_pkt_complete() Date: Sat, 20 Aug 2022 20:16:21 +0200 Message-Id: <20220820181623.12497-18-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" The function rtw_os_pkt_complete() was moved from the os_dep directory. It looks like the driver was originaly written to support different operating systems. Obviously we do not need an extra 'os' in the function name that indicates that the function is operating system specific. Rename it to rtw_pkt_complete(). Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index c324dada4f5b..f8d6f458b83e 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -229,7 +229,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) return res; } =20 -static void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *= pkt) +static void rtw_pkt_complete(struct adapter *padapter, struct sk_buff *pkt) { u16 queue; struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; @@ -250,7 +250,7 @@ static void rtw_os_pkt_complete(struct adapter *padapte= r, struct sk_buff *pkt) void rtw_xmit_complete(struct adapter *padapter, struct xmit_frame *pxfram= e) { if (pxframe->pkt) - rtw_os_pkt_complete(padapter, pxframe->pkt); + rtw_pkt_complete(padapter, pxframe->pkt); pxframe->pkt =3D NULL; } =20 @@ -1376,7 +1376,7 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, s= truct xmit_frame *pxmitfram spin_unlock_bh(&pfree_xmit_queue->lock); =20 if (pndis_pkt) - rtw_os_pkt_complete(padapter, pndis_pkt); + rtw_pkt_complete(padapter, pndis_pkt); =20 exit: =20 --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 90FD7C25B08 for ; Sat, 20 Aug 2022 18:18:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235589AbiHTSSM (ORCPT ); Sat, 20 Aug 2022 14:18:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232387AbiHTSQw (ORCPT ); Sat, 20 Aug 2022 14:16:52 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3181E30F68 for ; Sat, 20 Aug 2022 11:16:50 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id io12so2178796ejc.2 for ; Sat, 20 Aug 2022 11:16:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=88oHSzQ0vTHS0TxhRNvuFrIFb5k3LWgW3oAtlKkp/5g=; b=cWvX/3XYWw1VWHai/C2N4aD2DL5E9rQkXXxX7Z/rbs4P8owd0RWXpSDsK9eAdCM4UL RzZY4WyrXMYIvqzqYpGSqaCYbloJs9190wWQXGbCp84x25/yiOTKbtipJzemfjkzyWt+ fsft6WFJvpbySkTgRg1yE+V01xzvoKsSqTkx97e37470UGXPBvQbyp6Xa9dgGcAqvxZ/ KbJrwZnr4kyHD7La34IPWj0goNyvtxNklwhL36q33JO1JX5q80AilSwgrewv0T8YDlaE alMDCWq7dg6xsHpF/Z2BReDF45yN2CzWl55SllyczRRzz0taQFPnUbybKDT0CFhDNnb5 NgBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=88oHSzQ0vTHS0TxhRNvuFrIFb5k3LWgW3oAtlKkp/5g=; b=XMSPobggLLi3rWA1raDgnaOoreMzpYfawkplw6zfqZ4//unbITvR1VkKxEoF2b/DHQ RLjgl99Y4KL3oGvKtZiGxh83e1hJf6E8uDR8MAUQ3aJ6j+MGTPsAGhS/KpRkvWQ0hl5K quhQOkMNctrM1lc4WD+bK8Qnxp/9g9e+uwNUjg8LCrHYe7q7ibqiX+HDx9544vWQ32Q5 ddx0wRQTtmNP3VF4+tSvabxO9mF2IqS0an6JMyo7kbgS6uEg70jbgv8v7qVVddVnH58+ 6cEoAIBzl7icta9nrkFHxRAqR/BY59gmjiMrBibt3lTTHoS4b8vXOW0nxnAEnXInYmf+ kgRw== X-Gm-Message-State: ACgBeo3FKA0nGUf68uhpIVtkQKJp/991uqoOzvpWXocGWNgiU20TQNLd g6ROVkVfJSjgrerJe9DPXii3wUuKqho= X-Google-Smtp-Source: AA6agR5bLCKHk3jgTFpxnCTHYYLw6AWbWkNdbHL8hGi0BltBIa8RQZNCEsEJ7WDueawwZxhZ4szQ/g== X-Received: by 2002:a17:907:28c8:b0:730:9ccc:331f with SMTP id en8-20020a17090728c800b007309ccc331fmr8060357ejc.608.1661019408684; Sat, 20 Aug 2022 11:16:48 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16: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 18/19] staging: r8188eu: remove os_dep/xmit_linux.c Date: Sat, 20 Aug 2022 20:16:22 +0200 Message-Id: <20220820181623.12497-19-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" Move the last remaining function rtw_xmit_entry(), and the static functions it calls, from os_dep/xmit_linux.c to core/rtw_xmit.c and remove the now empty file os_dep/xmit_linux.c. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/Makefile | 1 - drivers/staging/r8188eu/core/rtw_xmit.c | 102 ++++++++++++++++ drivers/staging/r8188eu/include/rtw_xmit.h | 1 + drivers/staging/r8188eu/include/xmit_osdep.h | 2 - drivers/staging/r8188eu/os_dep/xmit_linux.c | 115 ------------------- 5 files changed, 103 insertions(+), 118 deletions(-) delete mode 100644 drivers/staging/r8188eu/os_dep/xmit_linux.c diff --git a/drivers/staging/r8188eu/Makefile b/drivers/staging/r8188eu/Mak= efile index b38fb8157d79..afafe6957155 100644 --- a/drivers/staging/r8188eu/Makefile +++ b/drivers/staging/r8188eu/Makefile @@ -27,7 +27,6 @@ r8188eu-y =3D \ os_dep/osdep_service.o \ os_dep/usb_intf.o \ os_dep/usb_ops_linux.o \ - os_dep/xmit_linux.o \ core/rtw_ap.o \ core/rtw_br_ext.o \ core/rtw_cmd.o \ diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index f8d6f458b83e..d41d1d09d8ae 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -2226,3 +2226,105 @@ void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, i= nt status) if (pxmitpriv->ack_tx) rtw_sctx_done_err(&pack_tx_ops, status); } + +static void rtw_check_xmit_resource(struct adapter *padapter, struct sk_bu= ff *pkt) +{ + struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; + u16 queue; + + queue =3D skb_get_queue_mapping(pkt); + if (padapter->registrypriv.wifi_spec) { + /* No free space for Tx, tx_worker is too slow */ + if (pxmitpriv->hwxmits[queue].accnt > WMM_XMIT_THRESHOLD) + netif_stop_subqueue(padapter->pnetdev, queue); + } else { + if (pxmitpriv->free_xmitframe_cnt <=3D 4) { + if (!netif_tx_queue_stopped(netdev_get_tx_queue(padapter->pnetdev, queu= e))) + netif_stop_subqueue(padapter->pnetdev, queue); + } + } +} + +static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) +{ + struct sta_priv *pstapriv =3D &padapter->stapriv; + struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; + struct list_head *phead, *plist; + struct sk_buff *newskb; + struct sta_info *psta =3D NULL; + s32 res; + + spin_lock_bh(&pstapriv->asoc_list_lock); + phead =3D &pstapriv->asoc_list; + plist =3D phead->next; + + /* free sta asoc_queue */ + while (phead !=3D plist) { + psta =3D container_of(plist, struct sta_info, asoc_list); + + plist =3D plist->next; + + /* avoid come from STA1 and send back STA1 */ + if (!memcmp(psta->hwaddr, &skb->data[6], 6)) + continue; + + newskb =3D skb_copy(skb, GFP_ATOMIC); + + if (newskb) { + memcpy(newskb->data, psta->hwaddr, 6); + res =3D rtw_xmit(padapter, &newskb); + if (res < 0) { + pxmitpriv->tx_drop++; + dev_kfree_skb_any(newskb); + } else { + pxmitpriv->tx_pkts++; + } + } else { + pxmitpriv->tx_drop++; + + spin_unlock_bh(&pstapriv->asoc_list_lock); + return false; /* Caller shall tx this multicast frame via normal way. = */ + } + } + + spin_unlock_bh(&pstapriv->asoc_list_lock); + dev_kfree_skb_any(skb); + return true; +} + +int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev) +{ + struct adapter *padapter =3D (struct adapter *)rtw_netdev_priv(pnetdev); + struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + s32 res =3D 0; + + if (!rtw_if_up(padapter)) + goto drop_packet; + + rtw_check_xmit_resource(padapter, pkt); + + if (!rtw_mc2u_disable && check_fwstate(pmlmepriv, WIFI_AP_STATE) && + (IP_MCAST_MAC(pkt->data) || ICMPV6_MCAST_MAC(pkt->data)) && + (padapter->registrypriv.wifi_spec =3D=3D 0)) { + if (pxmitpriv->free_xmitframe_cnt > (NR_XMITFRAME / 4)) { + res =3D rtw_mlcst2unicst(padapter, pkt); + if (res) + goto exit; + } + } + + res =3D rtw_xmit(padapter, &pkt); + if (res < 0) + goto drop_packet; + + pxmitpriv->tx_pkts++; + goto exit; + +drop_packet: + pxmitpriv->tx_drop++; + dev_kfree_skb_any(pkt); + +exit: + return 0; +} diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r= 8188eu/include/rtw_xmit.h index be9a7afad8ea..0d05ab9abcfb 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -368,6 +368,7 @@ int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 ti= meout_ms); void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status); =20 void rtw_xmit_complete(struct adapter *padapter, struct xmit_frame *pxfram= e); +int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); =20 /* include after declaring struct xmit_buf, in order to avoid warning */ #include "xmit_osdep.h" diff --git a/drivers/staging/r8188eu/include/xmit_osdep.h b/drivers/staging= /r8188eu/include/xmit_osdep.h index ae738d215e99..0a68b2dd8d5e 100644 --- a/drivers/staging/r8188eu/include/xmit_osdep.h +++ b/drivers/staging/r8188eu/include/xmit_osdep.h @@ -17,6 +17,4 @@ struct sta_xmit_priv; struct xmit_frame; struct xmit_buf; =20 -int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); - #endif /* __XMIT_OSDEP_H_ */ diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/= r8188eu/os_dep/xmit_linux.c deleted file mode 100644 index 4721447a02e8..000000000000 --- a/drivers/staging/r8188eu/os_dep/xmit_linux.c +++ /dev/null @@ -1,115 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 2007 - 2012 Realtek Corporation. */ - -#define _XMIT_OSDEP_C_ - -#include "../include/osdep_service.h" -#include "../include/drv_types.h" -#include "../include/wifi.h" -#include "../include/mlme_osdep.h" -#include "../include/xmit_osdep.h" -#include "../include/osdep_intf.h" -#include "../include/usb_osintf.h" - -static void rtw_check_xmit_resource(struct adapter *padapter, struct sk_bu= ff *pkt) -{ - struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; - u16 queue; - - queue =3D skb_get_queue_mapping(pkt); - if (padapter->registrypriv.wifi_spec) { - /* No free space for Tx, tx_worker is too slow */ - if (pxmitpriv->hwxmits[queue].accnt > WMM_XMIT_THRESHOLD) - netif_stop_subqueue(padapter->pnetdev, queue); - } else { - if (pxmitpriv->free_xmitframe_cnt <=3D 4) { - if (!netif_tx_queue_stopped(netdev_get_tx_queue(padapter->pnetdev, queu= e))) - netif_stop_subqueue(padapter->pnetdev, queue); - } - } -} - -static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) -{ - struct sta_priv *pstapriv =3D &padapter->stapriv; - struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; - struct list_head *phead, *plist; - struct sk_buff *newskb; - struct sta_info *psta =3D NULL; - s32 res; - - spin_lock_bh(&pstapriv->asoc_list_lock); - phead =3D &pstapriv->asoc_list; - plist =3D phead->next; - - /* free sta asoc_queue */ - while (phead !=3D plist) { - psta =3D container_of(plist, struct sta_info, asoc_list); - - plist =3D plist->next; - - /* avoid come from STA1 and send back STA1 */ - if (!memcmp(psta->hwaddr, &skb->data[6], 6)) - continue; - - newskb =3D skb_copy(skb, GFP_ATOMIC); - - if (newskb) { - memcpy(newskb->data, psta->hwaddr, 6); - res =3D rtw_xmit(padapter, &newskb); - if (res < 0) { - pxmitpriv->tx_drop++; - dev_kfree_skb_any(newskb); - } else { - pxmitpriv->tx_pkts++; - } - } else { - pxmitpriv->tx_drop++; - - spin_unlock_bh(&pstapriv->asoc_list_lock); - return false; /* Caller shall tx this multicast frame via normal way. = */ - } - } - - spin_unlock_bh(&pstapriv->asoc_list_lock); - dev_kfree_skb_any(skb); - return true; -} - -int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev) -{ - struct adapter *padapter =3D (struct adapter *)rtw_netdev_priv(pnetdev); - struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - s32 res =3D 0; - - if (!rtw_if_up(padapter)) - goto drop_packet; - - rtw_check_xmit_resource(padapter, pkt); - - if (!rtw_mc2u_disable && check_fwstate(pmlmepriv, WIFI_AP_STATE) && - (IP_MCAST_MAC(pkt->data) || ICMPV6_MCAST_MAC(pkt->data)) && - (padapter->registrypriv.wifi_spec =3D=3D 0)) { - if (pxmitpriv->free_xmitframe_cnt > (NR_XMITFRAME / 4)) { - res =3D rtw_mlcst2unicst(padapter, pkt); - if (res) - goto exit; - } - } - - res =3D rtw_xmit(padapter, &pkt); - if (res < 0) - goto drop_packet; - - pxmitpriv->tx_pkts++; - goto exit; - -drop_packet: - pxmitpriv->tx_drop++; - dev_kfree_skb_any(pkt); - -exit: - - return 0; -} --=20 2.37.2 From nobody Wed Apr 8 10:01:27 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 DA8D4C25B08 for ; Sat, 20 Aug 2022 18:17:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234664AbiHTSRv (ORCPT ); Sat, 20 Aug 2022 14:17:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232396AbiHTSQw (ORCPT ); Sat, 20 Aug 2022 14:16:52 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA2BC32045 for ; Sat, 20 Aug 2022 11:16:50 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id vw19so591538ejb.1 for ; Sat, 20 Aug 2022 11:16:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=SbZ9ZiVxuyeACf4/KqL5PgbBvR4jJU1zgm/G5ZPWing=; b=k2SFSmlGb4Finqn18OACg0OgpCeHrtiKtr0sIFWR6F9V1/JkcXGuj6sGu+4u6caqhb N2+iWA18A31VnI4JiVHlKBbKJ8W7Md8NV6X0RfCQd52r2+WEQAJOxhqk0wF5huoBapZ2 e1UpWqKdNx/me3xuafvgCmfs5ntExFGUzrxKANKlwQgC/gzTkXZfLVfblSZTRQQDg+0x rLPM7KFT4RoKoD+JKtCxmq3aGcHmGYgiZkrIUcAKe3T7jGTmud4ZoARyrspsre15i7qu yUvDshMXKUl9UcMONiMrdptH1LZy0RNFhCF3f4QaNa7xvbr0IUF88TbYsBufF2+jbJxr fWHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=SbZ9ZiVxuyeACf4/KqL5PgbBvR4jJU1zgm/G5ZPWing=; b=dNtuel3s6Xdq6Va03GNDrREn4QdGOY22S7IlAfpnMsbWXdEk0In+N/UWhJGKJ4kkEG 3fVD5Jh3/fwzx+PtsN4/NKEhR4fsFqN9Y4P3qP+hZCQ0a2BuECed2dZrvNq+OsF9NRpt S+Dr8W0WiJGWVvjo8lhbornaL94GdLHSo2TpMcv1kp1cefEuNSqNGmonqrU3z3Gu7bEi UC4TyaJWtlW7zHUtl+GaZnJam05nwm6Q1k5VYRT7MS52X1XwyhNzG60Zp/tAd164Efkv 1+kfHUia6xzHZOEGOsRMYzZYHHKfyVlCc3m3gCun1ehNkm7YObza29thCK8N4+qj8FhC kCEQ== X-Gm-Message-State: ACgBeo1lLbTqlR1F4Ys6WZk2l0ykr4Wc6ORX5BuAMqJOPas1qac6SbAX FCgeSubPQuMKrmBuNbA4o10= X-Google-Smtp-Source: AA6agR4MvA1CBLVvUKP2apXIzJIDOEj2Tkz4lx7eS2Z8tAbZ/rDvYgGLrw9hwS0DKSQYNR/8OaBrcQ== X-Received: by 2002:a17:907:6d16:b0:731:17b5:699 with SMTP id sa22-20020a1709076d1600b0073117b50699mr8923288ejc.23.1661019409330; Sat, 20 Aug 2022 11:16:49 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id g2-20020a17090604c200b0072af890f52dsm3887833eja.88.2022.08.20.11.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 11:16: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 19/19] staging: r8188eu: remove xmit_osdep.h Date: Sat, 20 Aug 2022 20:16:23 +0200 Message-Id: <20220820181623.12497-20-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220820181623.12497-1-straube.linux@gmail.com> References: <20220820181623.12497-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" After previous cleanups the header xmit_osdep.h only contains some structure forward declarations and extern declarations for some module parameters. The forward declarations are not needed. We can make the module parameters static in os_dep/os_intf.c and remove xmit_osdep.h. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme.c | 1 - drivers/staging/r8188eu/core/rtw_sta_mgt.c | 1 - drivers/staging/r8188eu/include/rtw_xmit.h | 3 --- drivers/staging/r8188eu/include/xmit_osdep.h | 20 -------------------- drivers/staging/r8188eu/os_dep/os_intfs.c | 7 +++---- drivers/staging/r8188eu/os_dep/usb_intf.c | 1 - 6 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 drivers/staging/r8188eu/include/xmit_osdep.h diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 9e7e0034d352..26d0aa307d17 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -6,7 +6,6 @@ #include "../include/osdep_service.h" #include "../include/drv_types.h" #include "../include/recv_osdep.h" -#include "../include/xmit_osdep.h" #include "../include/hal_intf.h" #include "../include/mlme_osdep.h" #include "../include/sta_info.h" diff --git a/drivers/staging/r8188eu/core/rtw_sta_mgt.c b/drivers/staging/r= 8188eu/core/rtw_sta_mgt.c index 2b58e11896b4..2d61cc9169c8 100644 --- a/drivers/staging/r8188eu/core/rtw_sta_mgt.c +++ b/drivers/staging/r8188eu/core/rtw_sta_mgt.c @@ -6,7 +6,6 @@ #include "../include/osdep_service.h" #include "../include/drv_types.h" #include "../include/recv_osdep.h" -#include "../include/xmit_osdep.h" #include "../include/mlme_osdep.h" #include "../include/sta_info.h" =20 diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r= 8188eu/include/rtw_xmit.h index 0d05ab9abcfb..8f54c41ba927 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -370,7 +370,4 @@ void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int s= tatus); void rtw_xmit_complete(struct adapter *padapter, struct xmit_frame *pxfram= e); int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); =20 -/* include after declaring struct xmit_buf, in order to avoid warning */ -#include "xmit_osdep.h" - #endif /* _RTL871X_XMIT_H_ */ diff --git a/drivers/staging/r8188eu/include/xmit_osdep.h b/drivers/staging= /r8188eu/include/xmit_osdep.h deleted file mode 100644 index 0a68b2dd8d5e..000000000000 --- a/drivers/staging/r8188eu/include/xmit_osdep.h +++ /dev/null @@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ -/* Copyright(c) 2007 - 2011 Realtek Corporation. */ - -#ifndef __XMIT_OSDEP_H_ -#define __XMIT_OSDEP_H_ - -#include "osdep_service.h" -#include "drv_types.h" - -extern int rtw_ht_enable; -extern int rtw_cbw40_enable; -extern int rtw_ampdu_enable;/* for enable tx_ampdu */ - -struct xmit_priv; -struct pkt_attrib; -struct sta_xmit_priv; -struct xmit_frame; -struct xmit_buf; - -#endif /* __XMIT_OSDEP_H_ */ diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8= 188eu/os_dep/os_intfs.c index 6405d88a4d24..2d2a1c27d433 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -5,7 +5,6 @@ =20 #include "../include/osdep_service.h" #include "../include/drv_types.h" -#include "../include/xmit_osdep.h" #include "../include/recv_osdep.h" #include "../include/hal_intf.h" #include "../include/rtw_ioctl.h" @@ -66,9 +65,9 @@ static int rtw_uapsd_acvo_en; =20 static int rtw_led_enable =3D 1; =20 -int rtw_ht_enable =3D 1; -int rtw_cbw40_enable =3D 3; /* 0 :disable, bit(0): enable 2.4g, bit(1): e= nable 5g */ -int rtw_ampdu_enable =3D 1;/* for enable tx_ampdu */ +static int rtw_ht_enable =3D 1; +static int rtw_cbw40_enable =3D 3; /* 0 :disable, bit(0): enable 2.4g, bi= t(1): enable 5g */ +static int rtw_ampdu_enable =3D 1;/* for enable tx_ampdu */ static int rtw_rx_stbc =3D 1;/* 0: disable, bit(0):enable 2.4g, bit(1):en= able 5g, default is set to enable 2.4GHZ for IOT issue with bufflao's AP at= 5GHZ */ static int rtw_ampdu_amsdu;/* 0: disabled, 1:enabled, 2:auto */ =20 diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8= 188eu/os_dep/usb_intf.c index 0c752cf0c6c5..2bc88dc03fa8 100644 --- a/drivers/staging/r8188eu/os_dep/usb_intf.c +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c @@ -5,7 +5,6 @@ #include "../include/osdep_service.h" #include "../include/drv_types.h" #include "../include/recv_osdep.h" -#include "../include/xmit_osdep.h" #include "../include/hal_intf.h" #include "../include/osdep_intf.h" #include "../include/usb_ops.h" --=20 2.37.2