From nobody Sat Apr 11 19:32:32 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 DCC88C19F2A for ; Sun, 7 Aug 2022 18:16:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235357AbiHGSQJ (ORCPT ); Sun, 7 Aug 2022 14:16:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234996AbiHGSPw (ORCPT ); Sun, 7 Aug 2022 14:15:52 -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 B63626474 for ; Sun, 7 Aug 2022 11:15:50 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id y13so12815702ejp.13 for ; Sun, 07 Aug 2022 11:15:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P1gpPfsIodgVIm9G1P/vlOiWdjuJeR0qp5ZcVhGWLIY=; b=ilNRWUIP5/wjwpue37LpskO1atBfOqpfrMJvdwKfooYdaBha//xLc5rvf7cQYQ+55n tmKQm1lri9ijUzyhz9tSQMTbYZxntl+clNUotA4ihpNwFpaevpTXRNpgCSqfMpxJc/v/ /kjMuy6ntVq8HeMy3rZixPWUrXHIxA6np/KlHucaoyd9QqhOUG7Bxq7FNuGuZQhUC0vF oI4NcrDNayFYmEAlvJx2vfTvfPAHionobX2EpI8F67A92silFUHaPNGYrRuBjMmAAMAP EH1HjErNwCKfHbzj/KCaeKqtFP4GKYqPwQy07foy0VebrWWuwKgazjXTBj6Vjh2caFR8 3pdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=P1gpPfsIodgVIm9G1P/vlOiWdjuJeR0qp5ZcVhGWLIY=; b=bqgZc1u6QW7Q4/9H376QAn1+s7S+MQz4VmzXwdzEVw6DWfVyoOosQr98Ae8PXsAOPw 8IkuZXvKqvpqBbM+PQKCFtmYRN/3Vm0O0EACRDf0jsM8JMvyUEkdPb7jp8H6NqAJevLK HEZ0gwBVVQQSZialseiBMreFvkrofKtu/w0/YC0sboovLi/CFUpfP9pTyHMLRZxNTrJx l9U6Z6eX/U6GmgsNrpX6racn4mQiR46ZDbCoybPQlpsyyAV+G0vMDvJI+fO3EHpEjzno ErGMlsSiO5a2HSyIYt/bGxKTKlcuaLrbyHoERp9amYLhLNlCVyzlchBxzHRGLYPuL4RS FgZQ== X-Gm-Message-State: ACgBeo243aGjPPiaeFuIsW9Tb/U8B5/5Wi405kTiFz6F1QaCxBNmr39a G/UFI0oqQi3Y0g8isT0eoWM= X-Google-Smtp-Source: AA6agR5wlbk8paOgeHLrs/Tr+hb1rk+jzDakLxQCMn+54H/5X/x8IIyjFumMB5cDJjCjbYZHLui3DQ== X-Received: by 2002:a17:907:7d91:b0:72b:4d74:f4f6 with SMTP id oz17-20020a1709077d9100b0072b4d74f4f6mr11228474ejc.314.1659896149366; Sun, 07 Aug 2022 11:15:49 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb84.dynamic.kabel-deutschland.de. [95.90.187.132]) by smtp.gmail.com with ESMTPSA id b7-20020a17090630c700b0072b92daef1csm4157441ejb.146.2022.08.07.11.15.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Aug 2022 11:15:49 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 1/5] staging: r8188eu: merge rtw_os_recvbuf_resource_free() into rtw_recv.c Date: Sun, 7 Aug 2022 20:15:34 +0200 Message-Id: <20220807181538.8499-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220807181538.8499-1-straube.linux@gmail.com> References: <20220807181538.8499-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_recvbuf_resource_free() is just a wrapper around usb_free_urb(). Call usb_free_urb() directly in rtl8188eu_free_recv_priv() and remove rtw_os_recvbuf_resource_free() to simplify the driver code. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_recv.c | 2 +- drivers/staging/r8188eu/include/recv_osdep.h | 1 - drivers/staging/r8188eu/os_dep/recv_linux.c | 8 -------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r818= 8eu/core/rtw_recv.c index 2d4baca804e9..7a97c090f297 100644 --- a/drivers/staging/r8188eu/core/rtw_recv.c +++ b/drivers/staging/r8188eu/core/rtw_recv.c @@ -159,7 +159,7 @@ static void rtl8188eu_free_recv_priv(struct adapter *pa= dapter) precvbuf =3D (struct recv_buf *)precvpriv->precv_buf; =20 for (i =3D 0; i < NR_RECVBUFF; i++) { - rtw_os_recvbuf_resource_free(padapter, precvbuf); + usb_free_urb(precvbuf->purb); precvbuf++; } =20 diff --git a/drivers/staging/r8188eu/include/recv_osdep.h b/drivers/staging= /r8188eu/include/recv_osdep.h index ca8a613508fd..b9dc32c20cfd 100644 --- a/drivers/staging/r8188eu/include/recv_osdep.h +++ b/drivers/staging/r8188eu/include/recv_osdep.h @@ -20,7 +20,6 @@ int rtw_init_recv_priv(struct recv_priv *precvpriv, struc= t adapter *padapter); void rtw_free_recv_priv(struct recv_priv *precvpriv); =20 int rtw_os_recvbuf_resource_alloc(struct adapter *adapt, struct recv_buf *= buf); -int rtw_os_recvbuf_resource_free(struct adapter *adapt, struct recv_buf *b= uf); =20 void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl); int _netdev_open(struct net_device *pnetdev); diff --git a/drivers/staging/r8188eu/os_dep/recv_linux.c b/drivers/staging/= r8188eu/os_dep/recv_linux.c index 1e14b6d49795..abdb42ab649b 100644 --- a/drivers/staging/r8188eu/os_dep/recv_linux.c +++ b/drivers/staging/r8188eu/os_dep/recv_linux.c @@ -26,14 +26,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapt= er, return res; } =20 -/* free os related resource in struct recv_buf */ -int rtw_os_recvbuf_resource_free(struct adapter *padapter, - struct recv_buf *precvbuf) -{ - usb_free_urb(precvbuf->purb); - return _SUCCESS; -} - void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup) { union iwreq_data wrqu; --=20 2.37.1 From nobody Sat Apr 11 19:32:32 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 4D1DCC19F2A for ; Sun, 7 Aug 2022 18:16:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235180AbiHGSQS (ORCPT ); Sun, 7 Aug 2022 14:16:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232313AbiHGSPy (ORCPT ); Sun, 7 Aug 2022 14:15:54 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5D3D64D9 for ; Sun, 7 Aug 2022 11:15:51 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id tl27so12921465ejc.1 for ; Sun, 07 Aug 2022 11:15:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CLsK8zyKuvk6BZGE5Y5TZ/KuheYdgzde52aWp1HCe2w=; b=MpOFy8JsXjXRXS7sUnFo5CZ6bZkjGKKDTIi4APUpbGeKaADxOHoOC3kaMh13qO8QG7 Fc04oiFT8VcUOVpUSZZm4XEBZOQxiSJ9dhJElra03xtqLCfZj8OURZ+aGlb69XDWqR7T bGpKfmZpB5zrHswcxdEZ5Si3eGRsvpoECsLtZLCWAgKuqgIkF2CphDgijfApwdCr65i/ 5RLwNyJJsLEn2gydgKY91VESc7vWBtKgxei1NII27BcXRXry0PAr7iLXEjhoLBc3p6An CqnBeicTShzFJ5vVnZPcd6aC6pLwaUj2DwqmmGJLuHtDuuMNsW+AJBOrX+0DO2EEq6iA 19qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CLsK8zyKuvk6BZGE5Y5TZ/KuheYdgzde52aWp1HCe2w=; b=yrmsk+/N0Qbfykv0m2jWoxF7EYi8B/aowEekPZNxr2T4QxfA15LI1tWbhv63uXqFmE tcychbXYaTo2weamUSi3X6xYgRr9btO8t4AsSjFNbLYveVUnWkekTYkBsgJ9gUBjEvdi YKkOZBwqzIpnGDwelZnNlRv0LJsmSpguGEqeMrQADIc2B0Mt7/mwibPVxzCXRhLfPunY gaigYiPlNYjmEv5sZ07ZeIObVrm4jHh5oMH35xui41CxoUdnZBSeiBf5+7eQ5sPkhEsv 1Qwpwr2LWODuLn94hX4ZnBb0m9iR1yh44ooJeCb+ES4773iEOh+BkLTlNg84KaalDuvw XAQw== X-Gm-Message-State: ACgBeo2W4QFLL1ZeMlwSGIEgSBiWgiYXmG1UKoaS1LT7pqDm7QBcmWn4 R5fiMdiFNjPNo894OsmGddQ= X-Google-Smtp-Source: AA6agR6/OjEybgEzJ3bZozk1S++gsbuswCKK5JOUkRVcNEwOYtezdZ1ebHHrHAzuDdrYtS9ms0uwYw== X-Received: by 2002:a17:907:6e88:b0:730:e16e:b760 with SMTP id sh8-20020a1709076e8800b00730e16eb760mr10353049ejc.5.1659896150263; Sun, 07 Aug 2022 11:15:50 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb84.dynamic.kabel-deutschland.de. [95.90.187.132]) by smtp.gmail.com with ESMTPSA id b7-20020a17090630c700b0072b92daef1csm4157441ejb.146.2022.08.07.11.15.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Aug 2022 11:15:50 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 2/5] staging: r8188eu: merge rtw_os_recvbuf_resource_alloc() into rtw_recv.c Date: Sun, 7 Aug 2022 20:15:35 +0200 Message-Id: <20220807181538.8499-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220807181538.8499-1-straube.linux@gmail.com> References: <20220807181538.8499-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" Merge the functionality of the function rtw_os_recvbuf_resource_alloc() into rtl8188eu_init_recv_priv(). Merging the functionality instead of just making the function static improves readability and we have one function less to care about when converting the uses of _FAIL/_SUCCESS to normal kernel error code logic. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_recv.c | 8 ++++++-- drivers/staging/r8188eu/include/recv_osdep.h | 2 -- drivers/staging/r8188eu/os_dep/recv_linux.c | 14 -------------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r818= 8eu/core/rtw_recv.c index 7a97c090f297..5de4e13b4b17 100644 --- a/drivers/staging/r8188eu/core/rtw_recv.c +++ b/drivers/staging/r8188eu/core/rtw_recv.c @@ -62,9 +62,13 @@ static int rtl8188eu_init_recv_priv(struct adapter *pada= pter) precvbuf =3D (struct recv_buf *)precvpriv->precv_buf; =20 for (i =3D 0; i < NR_RECVBUFF; i++) { - res =3D rtw_os_recvbuf_resource_alloc(padapter, precvbuf); - if (res =3D=3D _FAIL) + precvbuf->pskb =3D NULL; + precvbuf->reuse =3D false; + precvbuf->purb =3D usb_alloc_urb(0, GFP_KERNEL); + if (!precvbuf->purb) { + res =3D _FAIL; break; + } precvbuf->adapter =3D padapter; precvbuf++; } diff --git a/drivers/staging/r8188eu/include/recv_osdep.h b/drivers/staging= /r8188eu/include/recv_osdep.h index b9dc32c20cfd..51dc287f263c 100644 --- a/drivers/staging/r8188eu/include/recv_osdep.h +++ b/drivers/staging/r8188eu/include/recv_osdep.h @@ -19,8 +19,6 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8= bgroup); int rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapt= er); void rtw_free_recv_priv(struct recv_priv *precvpriv); =20 -int rtw_os_recvbuf_resource_alloc(struct adapter *adapt, struct recv_buf *= buf); - void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl); int _netdev_open(struct net_device *pnetdev); int netdev_open(struct net_device *pnetdev); diff --git a/drivers/staging/r8188eu/os_dep/recv_linux.c b/drivers/staging/= r8188eu/os_dep/recv_linux.c index abdb42ab649b..c180f0e4dd3c 100644 --- a/drivers/staging/r8188eu/os_dep/recv_linux.c +++ b/drivers/staging/r8188eu/os_dep/recv_linux.c @@ -12,20 +12,6 @@ #include "../include/osdep_intf.h" #include "../include/usb_ops.h" =20 -/* alloc os related resource in struct recv_buf */ -int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, - struct recv_buf *precvbuf) -{ - int res =3D _SUCCESS; - - precvbuf->purb =3D usb_alloc_urb(0, GFP_KERNEL); - if (!precvbuf->purb) - res =3D _FAIL; - precvbuf->pskb =3D NULL; - precvbuf->reuse =3D false; - return res; -} - void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup) { union iwreq_data wrqu; --=20 2.37.1 From nobody Sat Apr 11 19:32:32 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 6BAAFC19F2A for ; Sun, 7 Aug 2022 18:16:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235427AbiHGSQQ (ORCPT ); Sun, 7 Aug 2022 14:16:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235069AbiHGSPx (ORCPT ); Sun, 7 Aug 2022 14:15:53 -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 7285C6545 for ; Sun, 7 Aug 2022 11:15:52 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id m4so12905612ejr.3 for ; Sun, 07 Aug 2022 11:15:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4cI0C+edHqjQmmO/rArIoU+PLyf7AYRNI0KFouoRxco=; b=IlfguZNw5DsBKd9GOuXRcdMC7d9SV4iqU8oonFayH7IONPciQZHwTvQ6U20Srh6qrJ CBUVrWEI7CKWO2bUYVI9BFWA3sNVHNPuFXUOJf3NHFTIr9V14yO431vmfzpXb9rPYBiz Gue4DSMa+YgGZCdFHPy7TJscjag8Kzx0F4F+L0SIIjSTb2vRkqR6IJCPy9e4xeTNYpwA cAWXEZolY09u+DzHn9/xcki2HXsZ1zV8tZPLMrL3WjehP+RIxiFo5kigyLGxzqrXihVT z3WzUg1j4fe7ZPh9Vx2XZZE1pwjoUiAWh6qBI6x9j/v3W/K9oX7yf6eeasnkojvxgl/5 KAZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4cI0C+edHqjQmmO/rArIoU+PLyf7AYRNI0KFouoRxco=; b=HB0ap3y7xB415/gVJqJJSQz5BtVElzmnQGGlnGaLObe99u07+BZtRkzipoBtY6Xd+6 XJoXM5p2EHZCBzfrOo19Nm/DTNEqvk5v1Wtqz5Pdl5XgZU0J6QvnatUGQNIioSbkxK/E y8yGVenRMX8AcsrT9iCJU8CBNY5lRcqrcmUyNwHpyF027CSdcMo9Ytqa1y6ea7YB41nV ZmUZ0ULLF9jd+OwKUjz4MgorS/e5gfa41Krkmyz+ntqU47PXHI4OTBLMKJyjOWF3wtqG i3CCeRICR+cg4bkSRdmg/4a7vyocjW4ZwEPYT8amC1Wv9FkHApRLsTLu51i1scgXdviO wY1A== X-Gm-Message-State: ACgBeo2XHtWiAUULl/7+nSMTZ4DCLLq9KoY6I9Bp0T3+Esuzvcv/Zss+ 9YmpmRD5zx2eHXMaQsvsHDE= X-Google-Smtp-Source: AA6agR5fa5mdkH83cIh2tWtL6RDyjFhuXdTLQnxKV+zSOJHJFHFkOKTz9VflpshhYcnDb6xlUPX82A== X-Received: by 2002:a17:907:7388:b0:731:e57:dea3 with SMTP id er8-20020a170907738800b007310e57dea3mr7244985ejc.640.1659896151018; Sun, 07 Aug 2022 11:15:51 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb84.dynamic.kabel-deutschland.de. [95.90.187.132]) by smtp.gmail.com with ESMTPSA id b7-20020a17090630c700b0072b92daef1csm4157441ejb.146.2022.08.07.11.15.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Aug 2022 11:15:50 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 3/5] staging: r8188eu: make rtw_handle_tkip_mic_err() static Date: Sun, 7 Aug 2022 20:15:36 +0200 Message-Id: <20220807181538.8499-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220807181538.8499-1-straube.linux@gmail.com> References: <20220807181538.8499-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_handle_tkip_mic_err() is only used in rtw_recv.c. Make it static. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_recv.c | 36 ++++++++++++++++++++ drivers/staging/r8188eu/include/recv_osdep.h | 2 -- drivers/staging/r8188eu/os_dep/recv_linux.c | 36 -------------------- 3 files changed, 36 insertions(+), 38 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r818= 8eu/core/rtw_recv.c index 5de4e13b4b17..8f2b131eb767 100644 --- a/drivers/staging/r8188eu/core/rtw_recv.c +++ b/drivers/staging/r8188eu/core/rtw_recv.c @@ -327,6 +327,42 @@ u32 rtw_free_uc_swdec_pending_queue(struct adapter *ad= apter) return cnt; } =20 +static void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup) +{ + union iwreq_data wrqu; + struct iw_michaelmicfailure ev; + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + struct security_priv *psecuritypriv =3D &padapter->securitypriv; + u32 cur_time =3D 0; + + if (psecuritypriv->last_mic_err_time =3D=3D 0) { + psecuritypriv->last_mic_err_time =3D jiffies; + } else { + cur_time =3D jiffies; + + if (cur_time - psecuritypriv->last_mic_err_time < 60 * HZ) { + psecuritypriv->btkip_countermeasure =3D true; + psecuritypriv->last_mic_err_time =3D 0; + psecuritypriv->btkip_countermeasure_time =3D cur_time; + } else { + psecuritypriv->last_mic_err_time =3D jiffies; + } + } + + memset(&ev, 0x00, sizeof(ev)); + if (bgroup) + ev.flags |=3D IW_MICFAILURE_GROUP; + else + ev.flags |=3D IW_MICFAILURE_PAIRWISE; + + ev.src_addr.sa_family =3D ARPHRD_ETHER; + memcpy(ev.src_addr.sa_data, &pmlmepriv->assoc_bssid[0], ETH_ALEN); + memset(&wrqu, 0x00, sizeof(wrqu)); + wrqu.data.length =3D sizeof(ev); + wireless_send_event(padapter->pnetdev, IWEVMICHAELMICFAILURE, + &wrqu, (char *)&ev); +} + static int recvframe_chkmic(struct adapter *adapter, struct recv_frame *p= recvframe) { int i, res =3D _SUCCESS; diff --git a/drivers/staging/r8188eu/include/recv_osdep.h b/drivers/staging= /r8188eu/include/recv_osdep.h index 51dc287f263c..135fbb24fcbb 100644 --- a/drivers/staging/r8188eu/include/recv_osdep.h +++ b/drivers/staging/r8188eu/include/recv_osdep.h @@ -14,8 +14,6 @@ s32 rtw_recv_entry(struct recv_frame *precv_frame); int rtw_recv_indicatepkt(struct adapter *adapter, struct recv_frame *recv_= frame); void rtw_recv_returnpacket(struct net_device *cnxt, struct sk_buff *retpk= t); =20 -void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup); - int rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapt= er); void rtw_free_recv_priv(struct recv_priv *precvpriv); =20 diff --git a/drivers/staging/r8188eu/os_dep/recv_linux.c b/drivers/staging/= r8188eu/os_dep/recv_linux.c index c180f0e4dd3c..08dfe4482b8e 100644 --- a/drivers/staging/r8188eu/os_dep/recv_linux.c +++ b/drivers/staging/r8188eu/os_dep/recv_linux.c @@ -12,42 +12,6 @@ #include "../include/osdep_intf.h" #include "../include/usb_ops.h" =20 -void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup) -{ - union iwreq_data wrqu; - struct iw_michaelmicfailure ev; - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct security_priv *psecuritypriv =3D &padapter->securitypriv; - u32 cur_time =3D 0; - - if (psecuritypriv->last_mic_err_time =3D=3D 0) { - psecuritypriv->last_mic_err_time =3D jiffies; - } else { - cur_time =3D jiffies; - - if (cur_time - psecuritypriv->last_mic_err_time < 60 * HZ) { - psecuritypriv->btkip_countermeasure =3D true; - psecuritypriv->last_mic_err_time =3D 0; - psecuritypriv->btkip_countermeasure_time =3D cur_time; - } else { - psecuritypriv->last_mic_err_time =3D jiffies; - } - } - - memset(&ev, 0x00, sizeof(ev)); - if (bgroup) - ev.flags |=3D IW_MICFAILURE_GROUP; - else - ev.flags |=3D IW_MICFAILURE_PAIRWISE; - - ev.src_addr.sa_family =3D ARPHRD_ETHER; - memcpy(ev.src_addr.sa_data, &pmlmepriv->assoc_bssid[0], ETH_ALEN); - memset(&wrqu, 0x00, sizeof(wrqu)); - wrqu.data.length =3D sizeof(ev); - wireless_send_event(padapter->pnetdev, IWEVMICHAELMICFAILURE, - &wrqu, (char *)&ev); -} - int rtw_recv_indicatepkt(struct adapter *padapter, struct recv_frame *precv_frame) { --=20 2.37.1 From nobody Sat Apr 11 19:32:32 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 358EEC19F2A for ; Sun, 7 Aug 2022 18:16:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235596AbiHGSQZ (ORCPT ); Sun, 7 Aug 2022 14:16:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232960AbiHGSPy (ORCPT ); Sun, 7 Aug 2022 14:15:54 -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 31FAC6544 for ; Sun, 7 Aug 2022 11:15:53 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id j8so12844993ejx.9 for ; Sun, 07 Aug 2022 11:15:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jVLvkERwu7NE7/vOFxkPdswTEThZ3FDfNhElponhDZA=; b=TvLuaoGXQuyXyXbs3bOgtscD7X36Y91pWCdezxKHi8NHJY22bcgohfFJvLJTW591Zo yuhJUCiVINg/yPPnwQPsUuGt0yWia4tk6MWfo+9Cg8VCIq+LkTCXZdQLg1VxCHf2fVxx vPc4YKv6EVUGlaJAjmlLuOXffIX9IqDQbJqhzxfEynOvGH1xdf8zS+Mn69XI1igjb6eZ aHyaFdFwpqOXYkrlylB0MmGopPBCjsKH01zhEWr07kLxYZn+y+/uYO2zfpC14sGvqsXH 2UcMx5ATose+CNgqDcWojmpb3uXiBjF4RhVk2aozDCgLmdUN2poDrYDZbt2wkhXSlr+k Ta7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jVLvkERwu7NE7/vOFxkPdswTEThZ3FDfNhElponhDZA=; b=A61N01I+hmLUw1XF/Uqqya89eWd+Fea8GwCIBmvjUQ1jKMAssdk7AyOmCpmRu+2NRk Grrbh1PXD/xyeNq5b6n1DQji4T3If9+SHL3uqO0yCtTYxO9qndLzj7V7DYVB9HCG87jH R54ODBEhvsy5pL+j37Y+l7ElhiYI9i8U3soP1Deyt4Pbl20Qx2LU4W1poKAkKM7GsC/+ Y891m43ngaGmUvhd7FQWuistciYIj6yc/ZFkk2gbpItZTgwCV/uVJUz/kzBuMHKRwnSr yQeajUOXq43f5Zk5OTb/KEHAxc1lgpr0O5iUhI4swK50CfKs2ylXnciWdFpBTJ9xq3dL wUqg== X-Gm-Message-State: ACgBeo0vpC9nwkAwiLoq/6p+0rYTvMKoo15fFYp3iPw5WQlD4R3zLHIg 33SwF7pN5qnxTxk8PD2osRg= X-Google-Smtp-Source: AA6agR44R3Z8fQXwRs1p2O4uI8VRWxLh1iUyUr39Gg9EWl3gNUmzQYmdWD6ZGqKbvsI4j6oH/nhWaQ== X-Received: by 2002:a17:906:c781:b0:726:c967:8d1b with SMTP id cw1-20020a170906c78100b00726c9678d1bmr11526693ejb.54.1659896151815; Sun, 07 Aug 2022 11:15:51 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb84.dynamic.kabel-deutschland.de. [95.90.187.132]) by smtp.gmail.com with ESMTPSA id b7-20020a17090630c700b0072b92daef1csm4157441ejb.146.2022.08.07.11.15.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Aug 2022 11:15:51 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 4/5] staging: r8188eu: make rtw_recv_indicatepkt() static Date: Sun, 7 Aug 2022 20:15:37 +0200 Message-Id: <20220807181538.8499-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220807181538.8499-1-straube.linux@gmail.com> References: <20220807181538.8499-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_recv_indicatepkt() is only used in rtw_recv.c. Make it static. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_recv.c | 79 +++++++++++++++++++ drivers/staging/r8188eu/include/recv_osdep.h | 1 - drivers/staging/r8188eu/os_dep/recv_linux.c | 81 -------------------- 3 files changed, 79 insertions(+), 82 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r818= 8eu/core/rtw_recv.c index 8f2b131eb767..ee3817c3e1fd 100644 --- a/drivers/staging/r8188eu/core/rtw_recv.c +++ b/drivers/staging/r8188eu/core/rtw_recv.c @@ -1579,6 +1579,85 @@ static bool enqueue_reorder_recvframe(struct recv_re= order_ctrl *preorder_ctrl, s return true; } =20 +static int rtw_recv_indicatepkt(struct adapter *padapter, struct recv_fram= e *precv_frame) +{ + struct recv_priv *precvpriv; + struct __queue *pfree_recv_queue; + struct sk_buff *skb; + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + + precvpriv =3D &padapter->recvpriv; + pfree_recv_queue =3D &precvpriv->free_recv_queue; + + skb =3D precv_frame->pkt; + if (!skb) + goto _recv_indicatepkt_drop; + + skb->data =3D precv_frame->rx_data; + + skb_set_tail_pointer(skb, precv_frame->len); + + skb->len =3D precv_frame->len; + + if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) { + struct sk_buff *pskb2 =3D NULL; + struct sta_info *psta =3D NULL; + struct sta_priv *pstapriv =3D &padapter->stapriv; + struct rx_pkt_attrib *pattrib =3D &precv_frame->attrib; + bool bmcast =3D is_multicast_ether_addr(pattrib->dst); + + if (memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)) { + if (bmcast) { + psta =3D rtw_get_bcmc_stainfo(padapter); + pskb2 =3D skb_clone(skb, GFP_ATOMIC); + } else { + psta =3D rtw_get_stainfo(pstapriv, pattrib->dst); + } + + if (psta) { + struct net_device *pnetdev; + + pnetdev =3D (struct net_device *)padapter->pnetdev; + skb->dev =3D pnetdev; + skb_set_queue_mapping(skb, rtw_recv_select_queue(skb)); + + rtw_xmit_entry(skb, pnetdev); + + if (bmcast) + skb =3D pskb2; + else + goto _recv_indicatepkt_end; + } + } + } + + rcu_read_lock(); + rcu_dereference(padapter->pnetdev->rx_handler_data); + rcu_read_unlock(); + + skb->ip_summed =3D CHECKSUM_NONE; + skb->dev =3D padapter->pnetdev; + skb->protocol =3D eth_type_trans(skb, padapter->pnetdev); + + netif_rx(skb); + +_recv_indicatepkt_end: + + /* pointers to NULL before rtw_free_recvframe() */ + precv_frame->pkt =3D NULL; + + rtw_free_recvframe(precv_frame, pfree_recv_queue); + + return _SUCCESS; + +_recv_indicatepkt_drop: + + /* enqueue back to free_recv_queue */ + rtw_free_recvframe(precv_frame, pfree_recv_queue); + + return _FAIL; +} + static bool recv_indicatepkts_in_order(struct adapter *padapter, struct re= cv_reorder_ctrl *preorder_ctrl, int bforced) { struct list_head *phead, *plist; diff --git a/drivers/staging/r8188eu/include/recv_osdep.h b/drivers/staging= /r8188eu/include/recv_osdep.h index 135fbb24fcbb..e824bfac067e 100644 --- a/drivers/staging/r8188eu/include/recv_osdep.h +++ b/drivers/staging/r8188eu/include/recv_osdep.h @@ -11,7 +11,6 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, stru= ct adapter *padapter); void _rtw_free_recv_priv(struct recv_priv *precvpriv); =20 s32 rtw_recv_entry(struct recv_frame *precv_frame); -int rtw_recv_indicatepkt(struct adapter *adapter, struct recv_frame *recv_= frame); void rtw_recv_returnpacket(struct net_device *cnxt, struct sk_buff *retpk= t); =20 int rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapt= er); diff --git a/drivers/staging/r8188eu/os_dep/recv_linux.c b/drivers/staging/= r8188eu/os_dep/recv_linux.c index 08dfe4482b8e..ccf23e7fc4ab 100644 --- a/drivers/staging/r8188eu/os_dep/recv_linux.c +++ b/drivers/staging/r8188eu/os_dep/recv_linux.c @@ -12,87 +12,6 @@ #include "../include/osdep_intf.h" #include "../include/usb_ops.h" =20 -int rtw_recv_indicatepkt(struct adapter *padapter, - struct recv_frame *precv_frame) -{ - struct recv_priv *precvpriv; - struct __queue *pfree_recv_queue; - struct sk_buff *skb; - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - - precvpriv =3D &padapter->recvpriv; - pfree_recv_queue =3D &precvpriv->free_recv_queue; - - skb =3D precv_frame->pkt; - if (!skb) - goto _recv_indicatepkt_drop; - - skb->data =3D precv_frame->rx_data; - - skb_set_tail_pointer(skb, precv_frame->len); - - skb->len =3D precv_frame->len; - - if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) { - struct sk_buff *pskb2 =3D NULL; - struct sta_info *psta =3D NULL; - struct sta_priv *pstapriv =3D &padapter->stapriv; - struct rx_pkt_attrib *pattrib =3D &precv_frame->attrib; - bool bmcast =3D is_multicast_ether_addr(pattrib->dst); - - if (memcmp(pattrib->dst, myid(&padapter->eeprompriv), - ETH_ALEN)) { - if (bmcast) { - psta =3D rtw_get_bcmc_stainfo(padapter); - pskb2 =3D skb_clone(skb, GFP_ATOMIC); - } else { - psta =3D rtw_get_stainfo(pstapriv, pattrib->dst); - } - - if (psta) { - struct net_device *pnetdev; - - pnetdev =3D (struct net_device *)padapter->pnetdev; - skb->dev =3D pnetdev; - skb_set_queue_mapping(skb, rtw_recv_select_queue(skb)); - - rtw_xmit_entry(skb, pnetdev); - - if (bmcast) - skb =3D pskb2; - else - goto _recv_indicatepkt_end; - } - } - } - - rcu_read_lock(); - rcu_dereference(padapter->pnetdev->rx_handler_data); - rcu_read_unlock(); - - skb->ip_summed =3D CHECKSUM_NONE; - skb->dev =3D padapter->pnetdev; - skb->protocol =3D eth_type_trans(skb, padapter->pnetdev); - - netif_rx(skb); - -_recv_indicatepkt_end: - - /* pointers to NULL before rtw_free_recvframe() */ - precv_frame->pkt =3D NULL; - - rtw_free_recvframe(precv_frame, pfree_recv_queue); - - return _SUCCESS; - -_recv_indicatepkt_drop: - - /* enqueue back to free_recv_queue */ - rtw_free_recvframe(precv_frame, pfree_recv_queue); - - return _FAIL; -} - static void _rtw_reordering_ctrl_timeout_handler(struct timer_list *t) { struct recv_reorder_ctrl *preorder_ctrl; --=20 2.37.1 From nobody Sat Apr 11 19:32:32 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 06F7BC19F2A for ; Sun, 7 Aug 2022 18:16:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235154AbiHGSQb (ORCPT ); Sun, 7 Aug 2022 14:16:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234542AbiHGSPz (ORCPT ); Sun, 7 Aug 2022 14:15:55 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CFAB655A for ; Sun, 7 Aug 2022 11:15:53 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id gb36so12847925ejc.10 for ; Sun, 07 Aug 2022 11:15:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tpNJKNKlC50xQq5PpFQzujWlvGj3AJ292qB3U9+6dgE=; b=M82YULwaRLvi0ifXA4JINTwWxQ0TIE7hk6dNkj0zaHHUH8R+ecr1SPD0HGeKDE/eDN WdpZ1CxbA7ggxsX+J9PczksYx4JBghVLRGT4Z1ohl8jG+6IMMURpczj7JDA+0pwNagMy si/4ao2yxXV49coa+UaI4fYDxHYmeQNfdNAtVXdyG9Waikk5mj3s4jy2qYRI2ZAe7g8a 5UQV3VGC8GRXXCI2eSn3OUayWHGcukB9kykNiwPCvtdwCtJo16hmyKZ3P6jXyc0KavhL qHHG48p09J2mpPtZULoCPMQyVtrh9PXOmjpL9YnlnQaD1uu0FvRbigcFAChDrKToScxi 9PIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tpNJKNKlC50xQq5PpFQzujWlvGj3AJ292qB3U9+6dgE=; b=EiYwVOhap5kIG2xTCk54zDDALGLquFaw9m8vpjzvtQSzxHSbUjL1PiibzuR4sCvPp9 vH3tCk/tYUzsdeL4jJOY1nt1YWug4Z6nQEEIv/9Gar9b5EeTO2xgkTMTldrEIhsKq5C+ Ii5XIYK8odeR79uvY4S1M0yr0lMiChfMBxev2yvq+/jzwPYjxCAqtevs1xzzdtUAMvBZ CxDdfM5FPVwRQjj1qSAe7pCpJGK6mEMFylR1Y1M3WxG26r03G5T9rORL+AhgLMS1p7Su dRP3uYKCffMEKXzY7uRr1TxXyoR6Ne8JUlq1iyXdAgg/JfNFNbGIxguHuJhz2tNTAZJs VrAQ== X-Gm-Message-State: ACgBeo0X86n/3SX9Gy9TaViTK58ZxJ72ogIe7eveSwpAYQ4J/4AD2dR6 XCnDOkVuBLevT9yJv1lSDN0= X-Google-Smtp-Source: AA6agR5Z8ax36NV9vB60WsazWbZkbH/r9P460yzOSgZNfrZoSrFqYXnzJm6uUKzJHi3W7tqX348V3w== X-Received: by 2002:a17:907:a055:b0:730:a432:99d3 with SMTP id gz21-20020a170907a05500b00730a43299d3mr10686945ejc.690.1659896152538; Sun, 07 Aug 2022 11:15:52 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb84.dynamic.kabel-deutschland.de. [95.90.187.132]) by smtp.gmail.com with ESMTPSA id b7-20020a17090630c700b0072b92daef1csm4157441ejb.146.2022.08.07.11.15.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Aug 2022 11:15:52 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 5/5] staging: r8188eu: make rtw_init_recv_timer() static Date: Sun, 7 Aug 2022 20:15:38 +0200 Message-Id: <20220807181538.8499-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220807181538.8499-1-straube.linux@gmail.com> References: <20220807181538.8499-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_init_recv_timer() is only used in rtw_sta_mgt.c. Make it static and remove the now empty file os_dep/recv_linux.c. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/Makefile | 1 - drivers/staging/r8188eu/core/rtw_sta_mgt.c | 13 ++++++++++ drivers/staging/r8188eu/include/recv_osdep.h | 1 - drivers/staging/r8188eu/os_dep/recv_linux.c | 26 -------------------- 4 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 drivers/staging/r8188eu/os_dep/recv_linux.c diff --git a/drivers/staging/r8188eu/Makefile b/drivers/staging/r8188eu/Mak= efile index b118fd9b695c..b38fb8157d79 100644 --- a/drivers/staging/r8188eu/Makefile +++ b/drivers/staging/r8188eu/Makefile @@ -25,7 +25,6 @@ r8188eu-y =3D \ os_dep/mlme_linux.o \ os_dep/os_intfs.o \ os_dep/osdep_service.o \ - os_dep/recv_linux.o \ os_dep/usb_intf.o \ os_dep/usb_ops_linux.o \ os_dep/xmit_linux.o \ diff --git a/drivers/staging/r8188eu/core/rtw_sta_mgt.c b/drivers/staging/r= 8188eu/core/rtw_sta_mgt.c index 357f98e22d8a..bbc1ef146826 100644 --- a/drivers/staging/r8188eu/core/rtw_sta_mgt.c +++ b/drivers/staging/r8188eu/core/rtw_sta_mgt.c @@ -141,6 +141,19 @@ void _rtw_free_sta_priv(struct sta_priv *pstapriv) } } =20 +static void _rtw_reordering_ctrl_timeout_handler(struct timer_list *t) +{ + struct recv_reorder_ctrl *preorder_ctrl; + + preorder_ctrl =3D from_timer(preorder_ctrl, t, reordering_ctrl_timer); + rtw_reordering_ctrl_timeout_handler(preorder_ctrl); +} + +static void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl) +{ + timer_setup(&preorder_ctrl->reordering_ctrl_timer, _rtw_reordering_ctrl_t= imeout_handler, 0); +} + struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) { s32 index; diff --git a/drivers/staging/r8188eu/include/recv_osdep.h b/drivers/staging= /r8188eu/include/recv_osdep.h index e824bfac067e..d88fd6058a62 100644 --- a/drivers/staging/r8188eu/include/recv_osdep.h +++ b/drivers/staging/r8188eu/include/recv_osdep.h @@ -16,7 +16,6 @@ void rtw_recv_returnpacket(struct net_device *cnxt, stru= ct sk_buff *retpkt); int rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapt= er); void rtw_free_recv_priv(struct recv_priv *precvpriv); =20 -void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl); int _netdev_open(struct net_device *pnetdev); int netdev_open(struct net_device *pnetdev); int netdev_close(struct net_device *pnetdev); diff --git a/drivers/staging/r8188eu/os_dep/recv_linux.c b/drivers/staging/= r8188eu/os_dep/recv_linux.c deleted file mode 100644 index ccf23e7fc4ab..000000000000 --- a/drivers/staging/r8188eu/os_dep/recv_linux.c +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 2007 - 2011 Realtek Corporation. */ - -#define _RECV_OSDEP_C_ - -#include "../include/osdep_service.h" -#include "../include/drv_types.h" - -#include "../include/wifi.h" -#include "../include/recv_osdep.h" - -#include "../include/osdep_intf.h" -#include "../include/usb_ops.h" - -static void _rtw_reordering_ctrl_timeout_handler(struct timer_list *t) -{ - struct recv_reorder_ctrl *preorder_ctrl; - - preorder_ctrl =3D from_timer(preorder_ctrl, t, reordering_ctrl_timer); - rtw_reordering_ctrl_timeout_handler(preorder_ctrl); -} - -void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl) -{ - timer_setup(&preorder_ctrl->reordering_ctrl_timer, _rtw_reordering_ctrl_t= imeout_handler, 0); -} --=20 2.37.1