From nobody Fri Apr 10 20:15:43 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 1F104C32772 for ; Fri, 19 Aug 2022 12:55:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349226AbiHSMzO (ORCPT ); Fri, 19 Aug 2022 08:55:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349254AbiHSMyv (ORCPT ); Fri, 19 Aug 2022 08:54:51 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 825C676454 for ; Fri, 19 Aug 2022 05:54:41 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id o22so5542530edc.10 for ; Fri, 19 Aug 2022 05:54: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=CIjrHGuGx65kEr5OnXk6j8Kk9ipZphKrCoiITYTkDYM=; b=Q5SAh+2URpPpHI/LXe1o/nFD70HQH3JZ+f6a9SdnVWsZJpb5feJ1/fIa31wuqLs5sb 3l2FmUIpSUwLDc7N9bAObfySZkN5tTCuCbzyP73LHhp3wzaKss6LJSryNzMoebNTUV9J vwlASK8ti8rHBtlPT6KJNSK6XfWCud7HOFAAu+c/LVh74MRBaJOwfIGVxnvm+Ay4BUtd pdG0CTu9wP6z71YLntmteFV1bI944nlgpaGh73isN8qH6E/bHfU52elEzLg2KOd3Ej8c 2NV31BgmjcN0pdLbAstJTpEBdxzzJsJ7e6087UR3fT/rvGj7YG9clBshTqkIdg9Yy0QJ JVHw== 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=CIjrHGuGx65kEr5OnXk6j8Kk9ipZphKrCoiITYTkDYM=; b=japd+CP7cNzTPEu8QJLeXvUonwieQErS6x5Q1RSdpjU4eot8T5XtwfbxW0pez6UnXb aytAg0YC0NsKjOeZEZwYvQwndwppw561l2X5YH8n8C1c4zkvKykdCGCSYeNTxo5i+z7+ FprhuN7mVD2nfv6TAYZwmZyVvvh9pH7mnURycHbxdibGQJTjMVs2El9VAYBh/xN1JOw1 tLiNSTZ/p/wr45qcf7eLAwoeLfZYMBqPnkW/kVRHRrNjGDnTbmiIOxf4jLDDHgUnaKd0 6NtrZ6tc/sgZeT4t2960IRj6rYoDsx8AHzH6+rFlQwjLTs/XHuGOejUAx59r5eJ4ty/W 9Q/A== X-Gm-Message-State: ACgBeo1ykL9KdMHyUV3pReaC6+GG2UAXZYpcrhcubnn2ytVqljpzoAWW tfHs7YbfOFKj0xJGCf1jWEs= X-Google-Smtp-Source: AA6agR43A4yZvPS/8b8NGGA+fUNxNmRqIF7zq1pW5+HaDCtEsVsIinA7sIqZm4zs12UIOqsbOSYKiA== X-Received: by 2002:a05:6402:e94:b0:443:e3fe:7c87 with SMTP id h20-20020a0564020e9400b00443e3fe7c87mr6184960eda.144.1660913679764; Fri, 19 Aug 2022 05:54:39 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id b12-20020a056402138c00b0043d6ece495asm3000955edv.55.2022.08.19.05.54.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 05:54: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 01/11] staging: r8188eu: make init_mlme_ext_timer() static Date: Fri, 19 Aug 2022 14:54:18 +0200 Message-Id: <20220819125428.8412-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220819125428.8412-1-straube.linux@gmail.com> References: <20220819125428.8412-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 init_mlme_ext_timer() is only used in rtw_mlme_ext.c. Make it static to get one step closer to removing os_dep/mlme_linux.c. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 22 +++++++++++++++++++ .../staging/r8188eu/include/rtw_mlme_ext.h | 1 - drivers/staging/r8188eu/os_dep/mlme_linux.c | 21 ------------------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 6d3d5ff9a00e..3103e8871dfd 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -334,6 +334,28 @@ static u8 init_channel_set(struct adapter *padapter, u= 8 ChannelPlan, struct rt_c return chanset_size; } =20 +static void _survey_timer_hdl(struct timer_list *t) +{ + struct adapter *padapter =3D from_timer(padapter, t, mlmeextpriv.survey_t= imer); + + survey_timer_hdl(padapter); +} + +static void _link_timer_hdl(struct timer_list *t) +{ + struct adapter *padapter =3D from_timer(padapter, t, mlmeextpriv.link_tim= er); + + link_timer_hdl(padapter); +} + +static void init_mlme_ext_timer(struct adapter *padapter) +{ + struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; + + timer_setup(&pmlmeext->survey_timer, _survey_timer_hdl, 0); + timer_setup(&pmlmeext->link_timer, _link_timer_hdl, 0); +} + void init_mlme_ext_priv(struct adapter *padapter) { struct registry_priv *pregistrypriv =3D &padapter->registrypriv; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 343ce1ce4b3d..a6b1b1b7da74 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -388,7 +388,6 @@ struct mlme_ext_priv { void init_mlme_ext_priv(struct adapter *adapter); int init_hw_mlme_ext(struct adapter *padapter); void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext); -extern void init_mlme_ext_timer(struct adapter *padapter); extern void init_addba_retry_timer(struct adapter *adapt, struct sta_info = *sta); extern struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv); =20 diff --git a/drivers/staging/r8188eu/os_dep/mlme_linux.c b/drivers/staging/= r8188eu/os_dep/mlme_linux.c index 899d8e9c3834..bc4f979280b6 100644 --- a/drivers/staging/r8188eu/os_dep/mlme_linux.c +++ b/drivers/staging/r8188eu/os_dep/mlme_linux.c @@ -130,19 +130,6 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 aut= hmode, u8 *sec_ie) } } =20 -static void _survey_timer_hdl(struct timer_list *t) -{ - struct adapter *padapter =3D from_timer(padapter, t, mlmeextpriv.survey_t= imer); - - survey_timer_hdl(padapter); -} - -static void _link_timer_hdl(struct timer_list *t) -{ - struct adapter *padapter =3D from_timer(padapter, t, mlmeextpriv.link_tim= er); - link_timer_hdl(padapter); -} - static void _addba_timer_hdl(struct timer_list *t) { struct sta_info *psta =3D from_timer(psta, t, addba_retry_timer); @@ -154,14 +141,6 @@ void init_addba_retry_timer(struct adapter *padapter, = struct sta_info *psta) timer_setup(&psta->addba_retry_timer, _addba_timer_hdl, 0); } =20 -void init_mlme_ext_timer(struct adapter *padapter) -{ - struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; - - timer_setup(&pmlmeext->survey_timer, _survey_timer_hdl, 0); - timer_setup(&pmlmeext->link_timer, _link_timer_hdl, 0); -} - void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_inf= o *psta) { union iwreq_data wrqu; --=20 2.37.1 From nobody Fri Apr 10 20:15:43 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 C483BC32772 for ; Fri, 19 Aug 2022 12:55:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349239AbiHSMzU (ORCPT ); Fri, 19 Aug 2022 08:55:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349248AbiHSMyy (ORCPT ); Fri, 19 Aug 2022 08:54:54 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61F1E1D0EC for ; Fri, 19 Aug 2022 05:54:42 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id a22so5545947edj.5 for ; Fri, 19 Aug 2022 05:54: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=yyOz/wz9iFnuktDnmIg37pL//Hn26j/SMMCZDt4cX44=; b=mUD5vF9s6EowiuWQlcNrvyob52ML+8/CwuHe2GyqVRaVy978B3Prgv9D7XLQajVdoj bh1lC+5Cq+EPB1hBGxDOCnJTN4bGQLgNXGiP/7gDyMgdCWBmeTY7XA+RtohpGSMuP2iL 5EK8ACZ9taMNpLeqD2BkqkeTLBtkJzpWg/t10gAUiFEnZleEf0ZLtcwVkQl9i/reFPOL PstlgsrCPYs389Az03Tn5/HRmprMxk4Huo01BgqTtu+orWIH7kMTzNfABFHjZtuJN2p1 btlg22zfGsdvnAlNFLe3DVDBXBbFyLkJ83OgIoZCELAAP7Ikr+pMsnc9NODTgXTA9xzD SmJA== 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=yyOz/wz9iFnuktDnmIg37pL//Hn26j/SMMCZDt4cX44=; b=TpE4zyv0qUueEXErBCqwZfFUntWp4/Le3h5DIhuPZhxgds1swSdllKQf/Xh9lil4qj e4kxK+IQyeD8CvfE3iE2gt272wt4/EOzM3GpDiAtbicVTaMUngzXqFoNABrjUZHJ7wJa NCXNBfszkz4mvDZkqWa32R9vVSUFgPcjzddpB1eQxLfBLDxbgps7ZEoagn+Pl3TjuNXz jXPurO1qq+3GBzYItp0OqUCZESqv+JhYT4fy2YZVU8YzBpd1msbf1ofMOW0W4kPYrbDB JMOZbcqSFzGhWurw8B2b9+i6AgcPgXNOcEOIkzyIDThCGxUHFqWq0UdHLmG/K9+IMXHn EseA== X-Gm-Message-State: ACgBeo3+DGsdexgG3hr2JycpqEBf7TfGKvH74C60EA04KNjByAo4luja I5D6gzEVSfX+wV4TSsq2FU1bEfsdaRA= X-Google-Smtp-Source: AA6agR5mLeaXTWb3gHpI5s3OBuGr2Z+OBYDfL89LkUYEZEoyg8fxykAnWDpyOUmmhYtK5Lsb5YsUuA== X-Received: by 2002:a05:6402:43c8:b0:445:d773:c1ac with SMTP id p8-20020a05640243c800b00445d773c1acmr6191269edc.309.1660913680312; Fri, 19 Aug 2022 05:54:40 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id b12-20020a056402138c00b0043d6ece495asm3000955edv.55.2022.08.19.05.54.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 05:54: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 02/11] staging: r8188eu: make init_addba_retry_timer() static Date: Fri, 19 Aug 2022 14:54:19 +0200 Message-Id: <20220819125428.8412-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220819125428.8412-1-straube.linux@gmail.com> References: <20220819125428.8412-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 init_addba_retry_timer() is only used in rtw_sta_mgt.c. Make it static to get one step closer to removing os_dep/mlme_linux.c. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_sta_mgt.c | 12 ++++++++++++ drivers/staging/r8188eu/include/rtw_mlme_ext.h | 1 - drivers/staging/r8188eu/os_dep/mlme_linux.c | 11 ----------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_sta_mgt.c b/drivers/staging/r= 8188eu/core/rtw_sta_mgt.c index bbc1ef146826..2b58e11896b4 100644 --- a/drivers/staging/r8188eu/core/rtw_sta_mgt.c +++ b/drivers/staging/r8188eu/core/rtw_sta_mgt.c @@ -154,6 +154,18 @@ static void rtw_init_recv_timer(struct recv_reorder_ct= rl *preorder_ctrl) timer_setup(&preorder_ctrl->reordering_ctrl_timer, _rtw_reordering_ctrl_t= imeout_handler, 0); } =20 +static void _addba_timer_hdl(struct timer_list *t) +{ + struct sta_info *psta =3D from_timer(psta, t, addba_retry_timer); + + addba_timer_hdl(psta); +} + +static void init_addba_retry_timer(struct adapter *padapter, struct sta_in= fo *psta) +{ + timer_setup(&psta->addba_retry_timer, _addba_timer_hdl, 0); +} + struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) { s32 index; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index a6b1b1b7da74..e092e646c0d2 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -388,7 +388,6 @@ struct mlme_ext_priv { void init_mlme_ext_priv(struct adapter *adapter); int init_hw_mlme_ext(struct adapter *padapter); void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext); -extern void init_addba_retry_timer(struct adapter *adapt, struct sta_info = *sta); extern struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv); =20 unsigned char networktype_to_raid(unsigned char network_type); diff --git a/drivers/staging/r8188eu/os_dep/mlme_linux.c b/drivers/staging/= r8188eu/os_dep/mlme_linux.c index bc4f979280b6..b8d328d74443 100644 --- a/drivers/staging/r8188eu/os_dep/mlme_linux.c +++ b/drivers/staging/r8188eu/os_dep/mlme_linux.c @@ -130,17 +130,6 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 aut= hmode, u8 *sec_ie) } } =20 -static void _addba_timer_hdl(struct timer_list *t) -{ - struct sta_info *psta =3D from_timer(psta, t, addba_retry_timer); - addba_timer_hdl(psta); -} - -void init_addba_retry_timer(struct adapter *padapter, struct sta_info *pst= a) -{ - timer_setup(&psta->addba_retry_timer, _addba_timer_hdl, 0); -} - void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_inf= o *psta) { union iwreq_data wrqu; --=20 2.37.1 From nobody Fri Apr 10 20:15:43 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 0164CC32771 for ; Fri, 19 Aug 2022 12:55:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349281AbiHSMz2 (ORCPT ); Fri, 19 Aug 2022 08:55:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349249AbiHSMyy (ORCPT ); Fri, 19 Aug 2022 08:54:54 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3025479EFF for ; Fri, 19 Aug 2022 05:54:42 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id z20so5523960edb.9 for ; Fri, 19 Aug 2022 05:54: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=j4QGnRyzHDovtaBxZPEWBkKgdde1TdzHuU7Yr5hTj8c=; b=Xdj5glg+xd7AN0WjRq9Trdclbq8A70/xKUMpZi9cgzem0ODywscgUdn0Va2uAMWyd1 Jyzcl7YD3IDc+UddBCmxxiRIy2AGJteG6DHVGDdxLwfvVRvKYH/ekTOJ3mGBVZqJsyoF HhCwJ0U3UkrRi+CAZL01lA5mThkxp8y676qjWilwwJvTerL2IqTVyzvjfHRxSKxup1hf dv9CYSgdP3DrBNCmkaqVLyUyZR1OwHznIoAi7b9Gn22k+D6qnQiKA8GFrRoaln9bBSMx s+ldhTY9S7GZUt58sxMCtuUTs5o/IVom+nKjzh4nANORCEeBHeZpWLMyEwfjjsLuHKWZ gPVQ== 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=j4QGnRyzHDovtaBxZPEWBkKgdde1TdzHuU7Yr5hTj8c=; b=Nu4LkfEUGrCZ406XIOx/z7ZBiXjQbqL/3p3faG1gadbD1dF4ql1N+PBmWRTIKW3LkD C8Z+Vn8KLuigfrAqRxrbUJxhLLrj3kp/RZ/t8SAYk0MsCE16S/b8c1NMmSsX4Puxt/eG dCXV2P25T4TQ/x8TIcf/S4Pp1jRO399bph6Jpz5K5Zd67QhL55ZhPmuWzhkWZ2nxls3+ 39YR3JBQ1h2ZBKgoBkGZ3ZBwbFtAdlQ286eVSalmKhvM6+1tFgHLN5tHWW7Dcg1EL/Vf nM4LBMZwXzH681W4mEFeQcLLsK5B/d79PjTu/42sSJbBmn2FXtRhATLf6Rw+Dw7Q39rZ r+Qg== X-Gm-Message-State: ACgBeo3HXkFtEsU3xa6LIrfWT2n2RrdGVqnIoJJYv1mBBQ6nKE4pbzZP +VosMdaV9/RhgRhVI1RxHyw= X-Google-Smtp-Source: AA6agR7oe3y8ZlmtQk2OJYZcO2nX7HU/tAAuNgGvI9ayZMexHbkgYfjTtyOCIkCaFhbOfbQb83WgUQ== X-Received: by 2002:a05:6402:3881:b0:445:f8bf:5a1c with SMTP id fd1-20020a056402388100b00445f8bf5a1cmr6086214edb.13.1660913680883; Fri, 19 Aug 2022 05:54:40 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id b12-20020a056402138c00b0043d6ece495asm3000955edv.55.2022.08.19.05.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 05:54: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 03/11] staging: r8188eu: make rtw_indicate_sta_disassoc_event() static Date: Fri, 19 Aug 2022 14:54:20 +0200 Message-Id: <20220819125428.8412-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220819125428.8412-1-straube.linux@gmail.com> References: <20220819125428.8412-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_indicate_sta_disassoc_event() is only used in rtw_ap.c. Make it static to get one step closer to removing os_dep/mlme_linux.c. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_ap.c | 21 +++++++++++++++++++++ drivers/staging/r8188eu/include/rtw_ap.h | 2 -- drivers/staging/r8188eu/os_dep/mlme_linux.c | 21 --------------------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_ap.c b/drivers/staging/r8188e= u/core/rtw_ap.c index 5bd9dfa57cc5..a567683c21fd 100644 --- a/drivers/staging/r8188eu/core/rtw_ap.c +++ b/drivers/staging/r8188eu/core/rtw_ap.c @@ -935,6 +935,27 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapte= r, struct sta_info *psta) return beacon_updated; } =20 +static void rtw_indicate_sta_disassoc_event(struct adapter *padapter, stru= ct sta_info *psta) +{ + union iwreq_data wrqu; + struct sta_priv *pstapriv =3D &padapter->stapriv; + + if (!psta) + return; + + if (psta->aid > NUM_STA) + return; + + if (pstapriv->sta_aid[psta->aid - 1] !=3D psta) + return; + + wrqu.addr.sa_family =3D ARPHRD_ETHER; + + memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); + + wireless_send_event(padapter->pnetdev, IWEVEXPIRED, &wrqu, NULL); +} + u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16 reason) { diff --git a/drivers/staging/r8188eu/include/rtw_ap.h b/drivers/staging/r81= 88eu/include/rtw_ap.h index 724229fe84aa..8b4134eb3095 100644 --- a/drivers/staging/r8188eu/include/rtw_ap.h +++ b/drivers/staging/r8188eu/include/rtw_ap.h @@ -10,8 +10,6 @@ /* external function */ void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_info *psta); -void rtw_indicate_sta_disassoc_event(struct adapter *padapter, - struct sta_info *psta); void init_mlme_ap_info(struct adapter *padapter); void free_mlme_ap_info(struct adapter *padapter); void update_beacon(struct adapter *padapter, u8 ie_id, diff --git a/drivers/staging/r8188eu/os_dep/mlme_linux.c b/drivers/staging/= r8188eu/os_dep/mlme_linux.c index b8d328d74443..ad5f795f6857 100644 --- a/drivers/staging/r8188eu/os_dep/mlme_linux.c +++ b/drivers/staging/r8188eu/os_dep/mlme_linux.c @@ -150,24 +150,3 @@ void rtw_indicate_sta_assoc_event(struct adapter *pada= pter, struct sta_info *pst =20 wireless_send_event(padapter->pnetdev, IWEVREGISTERED, &wrqu, NULL); } - -void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_= info *psta) -{ - union iwreq_data wrqu; - struct sta_priv *pstapriv =3D &padapter->stapriv; - - if (!psta) - return; - - if (psta->aid > NUM_STA) - return; - - if (pstapriv->sta_aid[psta->aid - 1] !=3D psta) - return; - - wrqu.addr.sa_family =3D ARPHRD_ETHER; - - memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); - - wireless_send_event(padapter->pnetdev, IWEVEXPIRED, &wrqu, NULL); -} --=20 2.37.1 From nobody Fri Apr 10 20:15:43 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 56AF9C32771 for ; Fri, 19 Aug 2022 12:56:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348955AbiHSM4D (ORCPT ); Fri, 19 Aug 2022 08:56:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349266AbiHSMy6 (ORCPT ); Fri, 19 Aug 2022 08:54:58 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 738827B7AF for ; Fri, 19 Aug 2022 05:54:43 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id t5so5544662edc.11 for ; Fri, 19 Aug 2022 05:54: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=VQZuhT+vruVJe9YEYFvuAFzDJPr0QZ5/cyRE3vYoUZg=; b=itRnIEhrtNDTKZvVpDRGtBZdEhu1oyR2767o4jHeOyfDYCWG9xd/+3hWwlQslpqWWj /8AyCOmbpA+RwFlh33lG7WOPm/gksWLs390tPwrl4FJqInh3C/FPGi7S059mss1bINdc t0ohdjXVcCFDe9p3tAPKPHaucze0dMuSG9FQqf510pjeqardYrz0ceCrHP/aHeS1kAdd TqLzDjLAvZ5O/5lfR34jTeyd9HAlYlRTctW8N67A/HY4E4JCfFtXk52MtcWTdsbvHziv DLxCpWbW9HBPgn2l3Gq2+pbBBKx8vtRzOY9B1eTGR32VPwG2p9/HVbOVupIVq80NTgG1 LCHQ== 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=VQZuhT+vruVJe9YEYFvuAFzDJPr0QZ5/cyRE3vYoUZg=; b=t/p5hGQJ/nAfUnFFrhKCJLlXWp8h01C3nDVgPk6VJKKm2CrBFk9+Dv+jev6Cr+YSUN XHvro+dUbe66o4CAn1gxDIN+sScFiIcOYHLF6bnm2b/e+HNmAVp+y2AfzJuNaDHbWrpg SKc/TqvQbE2uVevDwG7dDt7sprRzFzt7iO9SX1QIkxNf0hWFDDo+D77y2KQwGPcPuLlT qj4wwbfT0hfR/Pbobkgj9DraSuiPWYI6lDo90GfhglS7XuDLlfHGskEnJfgjBcRLL83I xjOyk/GKkq9hhej30eg6fzGktaLnpQ7eZgESUkclVlugubQ7+bvOm0RLCOs/jIyum4J5 yqCg== X-Gm-Message-State: ACgBeo0Raaic1qgXhfKvxCHDqWXKIaYtmUh6rQFELYrFkSkZLHLmoHgu bWWdtmogxYxQjhV4WftnXe8/TQEK/hI= X-Google-Smtp-Source: AA6agR6eNvZ6APVC+t8pgRuJsvlNBspi+p6fIrSoxbJxZzrXtb1Z3/ACL9/V3LTpX9MKODR+dJxzkw== X-Received: by 2002:a05:6402:378f:b0:43a:d3f5:79f2 with SMTP id et15-20020a056402378f00b0043ad3f579f2mr6084087edb.338.1660913681431; Fri, 19 Aug 2022 05:54:41 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id b12-20020a056402138c00b0043d6ece495asm3000955edv.55.2022.08.19.05.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 05:54: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 04/11] staging: r8188eu: move rtw_indicate_sta_assoc_event() to rtw_ap.c Date: Fri, 19 Aug 2022 14:54:21 +0200 Message-Id: <20220819125428.8412-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220819125428.8412-1-straube.linux@gmail.com> References: <20220819125428.8412-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_indicate_sta_assoc_event() to core/rtw_ap.c to get one step closer to removing os_dep/mlme_linux.c. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_ap.c | 21 +++++++++++++++++++++ drivers/staging/r8188eu/os_dep/mlme_linux.c | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_ap.c b/drivers/staging/r8188e= u/core/rtw_ap.c index a567683c21fd..24eb8dce9bfe 100644 --- a/drivers/staging/r8188eu/core/rtw_ap.c +++ b/drivers/staging/r8188eu/core/rtw_ap.c @@ -935,6 +935,27 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapte= r, struct sta_info *psta) return beacon_updated; } =20 +void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_inf= o *psta) +{ + union iwreq_data wrqu; + struct sta_priv *pstapriv =3D &padapter->stapriv; + + if (!psta) + return; + + if (psta->aid > NUM_STA) + return; + + if (pstapriv->sta_aid[psta->aid - 1] !=3D psta) + return; + + wrqu.addr.sa_family =3D ARPHRD_ETHER; + + memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); + + wireless_send_event(padapter->pnetdev, IWEVREGISTERED, &wrqu, NULL); +} + static void rtw_indicate_sta_disassoc_event(struct adapter *padapter, stru= ct sta_info *psta) { union iwreq_data wrqu; diff --git a/drivers/staging/r8188eu/os_dep/mlme_linux.c b/drivers/staging/= r8188eu/os_dep/mlme_linux.c index ad5f795f6857..37c7f52421ee 100644 --- a/drivers/staging/r8188eu/os_dep/mlme_linux.c +++ b/drivers/staging/r8188eu/os_dep/mlme_linux.c @@ -129,24 +129,3 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 aut= hmode, u8 *sec_ie) kfree(buff); } } - -void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_inf= o *psta) -{ - union iwreq_data wrqu; - struct sta_priv *pstapriv =3D &padapter->stapriv; - - if (!psta) - return; - - if (psta->aid > NUM_STA) - return; - - if (pstapriv->sta_aid[psta->aid - 1] !=3D psta) - return; - - wrqu.addr.sa_family =3D ARPHRD_ETHER; - - memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); - - wireless_send_event(padapter->pnetdev, IWEVREGISTERED, &wrqu, NULL); -} --=20 2.37.1 From nobody Fri Apr 10 20:15:43 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 3EFBCC32772 for ; Fri, 19 Aug 2022 12:55:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349337AbiHSMzi (ORCPT ); Fri, 19 Aug 2022 08:55:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349251AbiHSMy4 (ORCPT ); Fri, 19 Aug 2022 08:54:56 -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 19B2F7D1E2 for ; Fri, 19 Aug 2022 05:54:43 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id a22so5546021edj.5 for ; Fri, 19 Aug 2022 05:54: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=6nwxe1++PRhv2s0+vNHsqO2vQoiOkVixhjx+02+ah2A=; b=IdMupijCCG07S6XRhxPDNwtwhCoqAA8u3wa3vFDBj4dAT6JIulwc8cVswfc54wc9uh GrvsEwfCRRJ48kGlmtl4TM4XLVRCvT8gMLRzRhgYFM8YYpufKCvHaLDMIw0EHtBEcTKV kEJtDu3E8B93sklpqSTT9pZZl7yb+/e6pNjdoIWLXvM+brUMF1TsucAjDC5NfZ4MyBC9 QIE33mKIR3UAcqZIYGZKny2BoC3VT2I2HKNDcCvXFE39xsDstpvmbvzoaTu2KUARcF9+ m0K/tixQt6HGJJRCXRynGgOzo4dq4aVj9q1Xa9vdq4fDzBrS2AENhz/jq6HGhC0bmWAk 3qZw== 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=6nwxe1++PRhv2s0+vNHsqO2vQoiOkVixhjx+02+ah2A=; b=j2Tsj2d3EgcyrXx4ii1Tfeh8/j+y9aXbawrWlJOCVoLCKfFU2fHmc2soB++nbrneEt AuSz+umQYR7+Whg42XvTzFaDa+MHWXitPE7KxrReJb4aueWtxyJYrQ6xoHLFHot94EXg dRxl3NLD+/TW40u6gCyAaJx+a843oYCiv3U5a6dnsPRNJqGvReY5EUpgS8ncy+lsgesI x+QSXEUh6sHiiQ6m04b2802dDWmOaQc6eAPFbbdeR6eJmyZMwcqkDpstEzdThLJKXSCW ffSOxwjnFZrs/jdz+V2wiRAgBf8rz9WkGUR3/QJgRZd9VU+NO6NgFy11iecBUAq8odrV hJNQ== X-Gm-Message-State: ACgBeo1Q0YlMK48fT8lnK8mQ82CnVCjp3ZfIbSpU/u7gBwWclAeXBIjp v431i7YgVYcdXfvC2om7sWM= X-Google-Smtp-Source: AA6agR5Gvbd2XyaxSiCHDP7C8nNhOGV3GL/jDgKcnsRiMw+6zrUGHKzWKm9zK4SaUCnZEGyCyHYEbw== X-Received: by 2002:aa7:c84f:0:b0:446:2bfb:5a63 with SMTP id g15-20020aa7c84f000000b004462bfb5a63mr3699865edt.172.1660913682048; Fri, 19 Aug 2022 05:54:42 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id b12-20020a056402138c00b0043d6ece495asm3000955edv.55.2022.08.19.05.54.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 05:54: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 05/11] staging: r8188eu: make rtw_report_sec_ie() static Date: Fri, 19 Aug 2022 14:54:22 +0200 Message-Id: <20220819125428.8412-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220819125428.8412-1-straube.linux@gmail.com> References: <20220819125428.8412-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_report_sec_ie() is only used in rtw_mlme.c. Make it static to get one step closer to removing os_dep/mlme_linux.c. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme.c | 27 ++++++++++++++++++++ drivers/staging/r8188eu/include/mlme_osdep.h | 1 - drivers/staging/r8188eu/os_dep/mlme_linux.c | 27 -------------------- 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 2705c9d87b14..213c64303b01 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -1639,6 +1639,33 @@ static int rtw_append_pmkid(struct adapter *Adapter,= int iEntry, u8 *ie, uint ie return ie_len; } =20 +static void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *se= c_ie) +{ + uint len; + u8 *buff, *p, i; + union iwreq_data wrqu; + + buff =3D NULL; + if (authmode =3D=3D _WPA_IE_ID_) { + buff =3D kzalloc(IW_CUSTOM_MAX, GFP_ATOMIC); + if (!buff) + return; + p =3D buff; + p +=3D sprintf(p, "ASSOCINFO(ReqIEs =3D"); + len =3D sec_ie[1] + 2; + len =3D (len < IW_CUSTOM_MAX) ? len : IW_CUSTOM_MAX; + for (i =3D 0; i < len; i++) + p +=3D sprintf(p, "%02x", sec_ie[i]); + p +=3D sprintf(p, ")"); + memset(&wrqu, 0, sizeof(wrqu)); + wrqu.data.length =3D p - buff; + wrqu.data.length =3D (wrqu.data.length < IW_CUSTOM_MAX) ? + wrqu.data.length : IW_CUSTOM_MAX; + wireless_send_event(adapter->pnetdev, IWEVCUSTOM, &wrqu, buff); + kfree(buff); + } +} + int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, ui= nt in_len) { u8 authmode =3D 0; diff --git a/drivers/staging/r8188eu/include/mlme_osdep.h b/drivers/staging= /r8188eu/include/mlme_osdep.h index 5b9f688f9424..2c0ce06bce82 100644 --- a/drivers/staging/r8188eu/include/mlme_osdep.h +++ b/drivers/staging/r8188eu/include/mlme_osdep.h @@ -11,7 +11,6 @@ void rtw_init_mlme_timer(struct adapter *padapter); void rtw_os_indicate_disconnect(struct adapter *adapter); void rtw_os_indicate_connect(struct adapter *adapter); void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted); -void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie); =20 void rtw_reset_securitypriv(struct adapter *adapter); void indicate_wx_scan_complete_event(struct adapter *padapter); diff --git a/drivers/staging/r8188eu/os_dep/mlme_linux.c b/drivers/staging/= r8188eu/os_dep/mlme_linux.c index 37c7f52421ee..aff9e18476db 100644 --- a/drivers/staging/r8188eu/os_dep/mlme_linux.c +++ b/drivers/staging/r8188eu/os_dep/mlme_linux.c @@ -102,30 +102,3 @@ void rtw_os_indicate_disconnect(struct adapter *adapte= r) rtw_indicate_wx_disassoc_event(adapter); rtw_reset_securitypriv(adapter); } - -void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie) -{ - uint len; - u8 *buff, *p, i; - union iwreq_data wrqu; - - buff =3D NULL; - if (authmode =3D=3D _WPA_IE_ID_) { - buff =3D kzalloc(IW_CUSTOM_MAX, GFP_ATOMIC); - if (!buff) - return; - p =3D buff; - p +=3D sprintf(p, "ASSOCINFO(ReqIEs =3D"); - len =3D sec_ie[1] + 2; - len =3D (len < IW_CUSTOM_MAX) ? len : IW_CUSTOM_MAX; - for (i =3D 0; i < len; i++) - p +=3D sprintf(p, "%02x", sec_ie[i]); - p +=3D sprintf(p, ")"); - memset(&wrqu, 0, sizeof(wrqu)); - wrqu.data.length =3D p - buff; - wrqu.data.length =3D (wrqu.data.length < IW_CUSTOM_MAX) ? - wrqu.data.length : IW_CUSTOM_MAX; - wireless_send_event(adapter->pnetdev, IWEVCUSTOM, &wrqu, buff); - kfree(buff); - } -} --=20 2.37.1 From nobody Fri Apr 10 20:15:43 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 07B8DC32771 for ; Fri, 19 Aug 2022 12:55:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348653AbiHSMzq (ORCPT ); Fri, 19 Aug 2022 08:55:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349127AbiHSMy5 (ORCPT ); Fri, 19 Aug 2022 08:54:57 -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 7C06056BA0 for ; Fri, 19 Aug 2022 05:54:44 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id q2so3435186edb.6 for ; Fri, 19 Aug 2022 05:54:44 -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=tpAs0I6mi3SUOtwu0/CjcjkIDmk/Vrs04W6AV02/W+s=; b=NhPiQyO51UgCQXdF3j2uQqCC9wCloxzP4LFinLB2hRf2wfol/F3UuJgwjzKbhXDsK1 L2hLK746NxNSM6q6vbbYM+7mqIHavC8P6hsvInYdy/RcIZqCAyVyJ4j9Ev8WNLF/FHOg 4f0lQx6hgP9AcXTOKqZfB4nZw5EfdPiMFGDDHrEnjx3RI39f2Q7MruizK32z8Qwhe9oq raqjkH4Q1STK9Qo1cQjPflAja1eOZQeSbSapJBRhnOfwITzn84ERU8ho9GReeyvbxAiI TpXNibgG6Npa8rWvB7cV5Qn2649k4RKxWqpktkm6AP8AgTRPDDQh9xU12sBRDNE786Iz OUgA== 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=tpAs0I6mi3SUOtwu0/CjcjkIDmk/Vrs04W6AV02/W+s=; b=v4lr8Tsl9kG6OCp+xndmjllHRtuWDDX1AnZUBaT2CHWUjmNMcC7KTsY66jWasp5cEW 3L8QJzZ2w/UQrMZ1Vr5prrPK3R5h8KtcV4OwK3jblCzTRaUqJLGM8wF6vX/ezJe0auso N3Q5Dt5CTORD3uscA4X6rWF2XfAh6AVDtDIS+whorLkaQrudOtCf5F5SPkByvKj5dGg8 N9RWZoeEcxGCJAWX18Ocd8yX/V4k5mp+qeao66VBe0z59l2EBFwGCtTeuFLshTwwsl1h He141je/NGvM0gXPR72yQupMD2C+drD9mbxmbxfePVs/RHXAIlNO5L/BhhA0h/i3jcXT fmyA== X-Gm-Message-State: ACgBeo1tWJIYXIH+aHgknoi53wyXQaD5b/E+TaXgLPbe5od6ISjNtalo oaUKbI2+t6By6DEbRCUqWu0= X-Google-Smtp-Source: AA6agR6qVQcCrDUpgOztkeCznxCfbvHrHpp/3zRAM8C3jGY+6jtCKN/MbpTsHsvH/CjwuSbO51ZZ7Q== X-Received: by 2002:a05:6402:270d:b0:43a:67b9:6eea with SMTP id y13-20020a056402270d00b0043a67b96eeamr6003185edd.94.1660913682645; Fri, 19 Aug 2022 05:54:42 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id b12-20020a056402138c00b0043d6ece495asm3000955edv.55.2022.08.19.05.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 05:54: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 06/11] staging: r8188eu: remove unneeded initializations Date: Fri, 19 Aug 2022 14:54:23 +0200 Message-Id: <20220819125428.8412-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220819125428.8412-1-straube.linux@gmail.com> References: <20220819125428.8412-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" In the function rtw_reset_securitypriv() three variables are initialized to zero. That is not necessary because they are all set before use in the code. Remove the initializations. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/os_dep/mlme_linux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/os_dep/mlme_linux.c b/drivers/staging/= r8188eu/os_dep/mlme_linux.c index aff9e18476db..48287aeaf502 100644 --- a/drivers/staging/r8188eu/os_dep/mlme_linux.c +++ b/drivers/staging/r8188eu/os_dep/mlme_linux.c @@ -57,9 +57,9 @@ static struct rt_pmkid_list backup_pmkid[NUM_PMKID_CACHE]; =20 void rtw_reset_securitypriv(struct adapter *adapter) { - u8 backup_index =3D 0; - u8 backup_counter =3D 0x00; - u32 backup_time =3D 0; + u8 backup_index; + u8 backup_counter; + u32 backup_time; =20 if (adapter->securitypriv.dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_8021X)= { /* 802.1x */ --=20 2.37.1 From nobody Fri Apr 10 20:15:43 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 BDDA4C3F6B0 for ; Fri, 19 Aug 2022 12:55:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349091AbiHSMzu (ORCPT ); Fri, 19 Aug 2022 08:55:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349138AbiHSMy5 (ORCPT ); Fri, 19 Aug 2022 08:54:57 -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 42C877D785 for ; Fri, 19 Aug 2022 05:54:44 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id o22so5542705edc.10 for ; Fri, 19 Aug 2022 05:54:44 -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=tAmQnmMG9ngyzqoxqUFov3vhCv4LuzEIa0OtSUt5erk=; b=jo0fx+NYJC1/UVGcqXo9qyO+QFAdYLpa5ReA1N1BWsm+LZKGPFdLMOxHuoVX9cVhN2 mqZ8m00O0N3CkVR8yF/r3RZKFWCla9Q5yXsXLjPrm4Z0YdgZE4ECu2fAJX7ZSyHDDCyn vUgKMH7ocjYWj5M7y78UFMjfcHSlR+BT4iCIoKDYkeT/6RMe6c5Fx5V8trJDcngzBOfg v6PKD/k9TsWtoQTFKOySwt+NSUK+jNq7C1q80i9amu9/y5Z48zt/qe2aFZOKIRgyTSWz hY4QTNi2zjnGyE1fXcFu9M/oSh03CKkuDYwpGfciTDvc6kLNaniyVLuzDhLR5UIlMnzV psIg== 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=tAmQnmMG9ngyzqoxqUFov3vhCv4LuzEIa0OtSUt5erk=; b=ickK9Cvb6lQG/Xb+kMZVx3t8LUs7/V9M+kD2dTThQdNU4lZPj5RjllozdAVFtoxepb tnE+ehjT0Csqk2SZuzQGPhHwG4WODZnNGWGu5GQiYurcp5PQ9xbFq6Zt6ZgVmQkRoLF9 0ivLPPZC+BiyogzZKvzZgEcV55cvKSQa9zApQiLS3Gym7fTWkZGnsHc16ypItbt8q59H 8o3RIKj0M8pL6EtCOyGwK4Vf7GMWrdvb6WkdfuS849Tb8QoTsf23ojJ6AasJUm4+gPEB f9ed57kecbcsWxDpKNBa0XcHhFB0HBNZ2WUx0xgMCWrkWAiGP8+6qrk3w9hG0EY9gKee KSog== X-Gm-Message-State: ACgBeo1xCf0gsu9+aQoU58y4uFbeRbjFpTmb/cayVJ/+QBCwJDF3jmVA GsyybNZdTeFIRP3VfkVPDTM= X-Google-Smtp-Source: AA6agR54ilZIKV+QdyHINpGf9KP2HA9n7Yep9v+eE8XoH/t/YLXviYs3rsm82Qf7cRtV5Ww2ZOxRZA== X-Received: by 2002:a05:6402:90a:b0:443:8b10:bcad with SMTP id g10-20020a056402090a00b004438b10bcadmr6110556edz.416.1660913683255; Fri, 19 Aug 2022 05:54:43 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id b12-20020a056402138c00b0043d6ece495asm3000955edv.55.2022.08.19.05.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 05:54: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 07/11] staging: r8188eu: make rtw_reset_securitypriv() static Date: Fri, 19 Aug 2022 14:54:24 +0200 Message-Id: <20220819125428.8412-8-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220819125428.8412-1-straube.linux@gmail.com> References: <20220819125428.8412-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_reset_securitypriv() is only used in rtw_mlme.c. Make rtw_reset_securitypriv() and its user rtw_os_indicate_disconnect() static to get one step closer to removing os_dep/mlme_linux.c. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme.c | 51 ++++++++++++++++++++ drivers/staging/r8188eu/include/mlme_osdep.h | 2 - drivers/staging/r8188eu/os_dep/mlme_linux.c | 50 ------------------- 3 files changed, 51 insertions(+), 52 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 213c64303b01..6e51d735b2bb 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -795,6 +795,57 @@ void rtw_free_assoc_resources(struct adapter *adapter,= int lock_scanned_queue) =20 } =20 +static struct rt_pmkid_list backup_pmkid[NUM_PMKID_CACHE]; + +static void rtw_reset_securitypriv(struct adapter *adapter) +{ + u8 backup_index; + u8 backup_counter; + u32 backup_time; + + if (adapter->securitypriv.dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_8021X)= { + /* 802.1x */ + /* We have to backup the PMK information for WiFi PMK Caching test item= . */ + /* Backup the btkip_countermeasure information. */ + /* When the countermeasure is trigger, the driver have to disconnect wi= th AP for 60 seconds. */ + memcpy(&backup_pmkid[0], &adapter->securitypriv.PMKIDList[0], sizeof(str= uct rt_pmkid_list) * NUM_PMKID_CACHE); + backup_index =3D adapter->securitypriv.PMKIDIndex; + backup_counter =3D adapter->securitypriv.btkip_countermeasure; + backup_time =3D adapter->securitypriv.btkip_countermeasure_time; + memset((unsigned char *)&adapter->securitypriv, 0, sizeof(struct securit= y_priv)); + + /* Restore the PMK information to securitypriv structure for the follow= ing connection. */ + memcpy(&adapter->securitypriv.PMKIDList[0], + &backup_pmkid[0], + sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); + adapter->securitypriv.PMKIDIndex =3D backup_index; + adapter->securitypriv.btkip_countermeasure =3D backup_counter; + adapter->securitypriv.btkip_countermeasure_time =3D backup_time; + adapter->securitypriv.ndisauthtype =3D Ndis802_11AuthModeOpen; + adapter->securitypriv.ndisencryptstatus =3D Ndis802_11WEPDisabled; + } else { + /* reset values in securitypriv */ + struct security_priv *psec_priv =3D &adapter->securitypriv; + + psec_priv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_Open; /* open system */ + psec_priv->dot11PrivacyAlgrthm =3D _NO_PRIVACY_; + psec_priv->dot11PrivacyKeyIndex =3D 0; + psec_priv->dot118021XGrpPrivacy =3D _NO_PRIVACY_; + psec_priv->dot118021XGrpKeyid =3D 1; + psec_priv->ndisauthtype =3D Ndis802_11AuthModeOpen; + psec_priv->ndisencryptstatus =3D Ndis802_11WEPDisabled; + } +} + +static void rtw_os_indicate_disconnect(struct adapter *adapter) +{ + /* Do it first for tx broadcast pkt after disconnection issue! */ + netif_carrier_off(adapter->pnetdev); + + rtw_indicate_wx_disassoc_event(adapter); + rtw_reset_securitypriv(adapter); +} + /* *rtw_indicate_connect: the caller has to lock pmlmepriv->lock */ diff --git a/drivers/staging/r8188eu/include/mlme_osdep.h b/drivers/staging= /r8188eu/include/mlme_osdep.h index 2c0ce06bce82..9cee84acff6b 100644 --- a/drivers/staging/r8188eu/include/mlme_osdep.h +++ b/drivers/staging/r8188eu/include/mlme_osdep.h @@ -8,11 +8,9 @@ #include "drv_types.h" =20 void rtw_init_mlme_timer(struct adapter *padapter); -void rtw_os_indicate_disconnect(struct adapter *adapter); void rtw_os_indicate_connect(struct adapter *adapter); void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted); =20 -void rtw_reset_securitypriv(struct adapter *adapter); void indicate_wx_scan_complete_event(struct adapter *padapter); =20 #endif /* _MLME_OSDEP_H_ */ diff --git a/drivers/staging/r8188eu/os_dep/mlme_linux.c b/drivers/staging/= r8188eu/os_dep/mlme_linux.c index 48287aeaf502..d439ffaf9797 100644 --- a/drivers/staging/r8188eu/os_dep/mlme_linux.c +++ b/drivers/staging/r8188eu/os_dep/mlme_linux.c @@ -52,53 +52,3 @@ void rtw_os_indicate_scan_done(struct adapter *padapter,= bool aborted) { indicate_wx_scan_complete_event(padapter); } - -static struct rt_pmkid_list backup_pmkid[NUM_PMKID_CACHE]; - -void rtw_reset_securitypriv(struct adapter *adapter) -{ - u8 backup_index; - u8 backup_counter; - u32 backup_time; - - if (adapter->securitypriv.dot11AuthAlgrthm =3D=3D dot11AuthAlgrthm_8021X)= { - /* 802.1x */ - /* We have to backup the PMK information for WiFi PMK Caching test item= . */ - /* Backup the btkip_countermeasure information. */ - /* When the countermeasure is trigger, the driver have to disconnect wi= th AP for 60 seconds. */ - memcpy(&backup_pmkid[0], &adapter->securitypriv.PMKIDList[0], sizeof(str= uct rt_pmkid_list) * NUM_PMKID_CACHE); - backup_index =3D adapter->securitypriv.PMKIDIndex; - backup_counter =3D adapter->securitypriv.btkip_countermeasure; - backup_time =3D adapter->securitypriv.btkip_countermeasure_time; - memset((unsigned char *)&adapter->securitypriv, 0, sizeof(struct securit= y_priv)); - - /* Restore the PMK information to securitypriv structure for the follow= ing connection. */ - memcpy(&adapter->securitypriv.PMKIDList[0], - &backup_pmkid[0], - sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); - adapter->securitypriv.PMKIDIndex =3D backup_index; - adapter->securitypriv.btkip_countermeasure =3D backup_counter; - adapter->securitypriv.btkip_countermeasure_time =3D backup_time; - adapter->securitypriv.ndisauthtype =3D Ndis802_11AuthModeOpen; - adapter->securitypriv.ndisencryptstatus =3D Ndis802_11WEPDisabled; - } else { - /* reset values in securitypriv */ - struct security_priv *psec_priv =3D &adapter->securitypriv; - - psec_priv->dot11AuthAlgrthm =3D dot11AuthAlgrthm_Open; /* open system */ - psec_priv->dot11PrivacyAlgrthm =3D _NO_PRIVACY_; - psec_priv->dot11PrivacyKeyIndex =3D 0; - psec_priv->dot118021XGrpPrivacy =3D _NO_PRIVACY_; - psec_priv->dot118021XGrpKeyid =3D 1; - psec_priv->ndisauthtype =3D Ndis802_11AuthModeOpen; - psec_priv->ndisencryptstatus =3D Ndis802_11WEPDisabled; - } -} - -void rtw_os_indicate_disconnect(struct adapter *adapter) -{ - - netif_carrier_off(adapter->pnetdev); /* Do it first for tx broadcast pkt= after disconnection issue! */ - rtw_indicate_wx_disassoc_event(adapter); - rtw_reset_securitypriv(adapter); -} --=20 2.37.1 From nobody Fri Apr 10 20:15:43 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 17ACAC32771 for ; Fri, 19 Aug 2022 12:55:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349179AbiHSMzx (ORCPT ); Fri, 19 Aug 2022 08:55:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349194AbiHSMy6 (ORCPT ); Fri, 19 Aug 2022 08:54:58 -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 057DB8607E for ; Fri, 19 Aug 2022 05:54:45 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id o22so5542766edc.10 for ; Fri, 19 Aug 2022 05:54: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=rXYLqyvUZrDN2atFN2rBSj6q0FVOWGSmJ64xIojR0jo=; b=IyMU8Q0g1EDviaijWxU0HOP0rhogM+knpciweLZp3KyJeTUUfsKqpUcL45r4wJVS35 HgXshxSpXPW761SZneyuC7aaK32j/UT9vNl5e0QuSXbkH3lnOqUx/exE4szyybj3q+Lr msmfs0kWzb4wZtTaVhOj3ZUDC6fQsiAxu2L9faFOWGRkU6tcspWigb139sBiioRTcjPD KvRbWWB999vwFaRDYZSC5nbQAY6sbP8ipXbeElTmxk9neAUom5GPknco566HgfU2iEb2 QVVdMszSNR/dERKkypfiPVeC+c4nOQ6UgPpET9FmyXUifo6YiytjNM9bNmP9BSPpWOwe na2A== 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=rXYLqyvUZrDN2atFN2rBSj6q0FVOWGSmJ64xIojR0jo=; b=hT+IkkWds2WDoYAygkoYB0l7aAaVNaAAxsNhZTrX+FyZrCYPHdUPRfOY1Lw5wuRjYX 05BaDKrfjxCtUEkTnpYUkFAG4yuUx/DQ/NQAWEP+aPT2mz3zjONAYD87vxqkpSesIWeS WE8bVVtDxJPsOK5vh/AD7XgbfJ/YDyaiocTk5FzX3nBWC/ExX/xIZpXP1OnTCTClC0Gg 8clhehwmBAgpR1g2j21azccxgrTDGjcqVy6Nckj8p8I6jQOhSaYfmgCAm6wqZI6Chh/2 +qME+dRfQkleQhsjx35QUo8GJE44x6oMcAAGerTiYT6z04ZoWp2P1TytuUi2SBerBWSz UqlQ== X-Gm-Message-State: ACgBeo3decYOnqBpSECXRwVA+DsA0delaKFxCpy7q0gRvWmOsEyRlfUw OZgNYcehIpbiYNGzaDCvnxQ= X-Google-Smtp-Source: AA6agR6MxNlU186MP5egDDLOeR/KWwwZthJZ/YMEAcL+bp+EO/EOrwf/iSpBjapFlEJodROX5ynLog== X-Received: by 2002:a05:6402:448b:b0:43b:5ec6:8863 with SMTP id er11-20020a056402448b00b0043b5ec68863mr5923937edb.377.1660913683809; Fri, 19 Aug 2022 05:54:43 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id b12-20020a056402138c00b0043d6ece495asm3000955edv.55.2022.08.19.05.54.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 05:54: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 08/11] staging: r8188eu: merge rtw_{os,}_indicate_disconnect() Date: Fri, 19 Aug 2022 14:54:25 +0200 Message-Id: <20220819125428.8412-9-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220819125428.8412-1-straube.linux@gmail.com> References: <20220819125428.8412-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 rtw_os_indicate_disconnect() into rtw_indicate_disconnect(). The function rtw_os_indicate_disconnect() was moved from the os_dep directory. It looks like the driver was originaly written to support different operating systems. We do not need this wrapping into an extra _os_ function obviously. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 6e51d735b2bb..3050c85dec2c 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -837,15 +837,6 @@ static void rtw_reset_securitypriv(struct adapter *ada= pter) } } =20 -static void rtw_os_indicate_disconnect(struct adapter *adapter) -{ - /* Do it first for tx broadcast pkt after disconnection issue! */ - netif_carrier_off(adapter->pnetdev); - - rtw_indicate_wx_disassoc_event(adapter); - rtw_reset_securitypriv(adapter); -} - /* *rtw_indicate_connect: the caller has to lock pmlmepriv->lock */ @@ -882,7 +873,11 @@ void rtw_indicate_disconnect(struct adapter *padapter) =20 if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) || (pmlmepriv->to_roaming <=3D 0)) { - rtw_os_indicate_disconnect(padapter); + /* Do it first for tx broadcast pkt after disconnection issue! */ + netif_carrier_off(padapter->pnetdev); + + rtw_indicate_wx_disassoc_event(padapter); + rtw_reset_securitypriv(padapter); =20 _clr_fwstate_(pmlmepriv, _FW_LINKED); rtw_led_control(padapter, LED_CTL_NO_LINK); --=20 2.37.1 From nobody Fri Apr 10 20:15:43 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 C5594C32771 for ; Fri, 19 Aug 2022 12:56:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349067AbiHSM4I (ORCPT ); Fri, 19 Aug 2022 08:56:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349140AbiHSMy6 (ORCPT ); Fri, 19 Aug 2022 08:54:58 -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 9927B883C2 for ; Fri, 19 Aug 2022 05:54:46 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id z20so5524169edb.9 for ; Fri, 19 Aug 2022 05:54: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=zaChLvpV1bYStSPvXlAV7o8JyBUldM/i5tXZW+WmTms=; b=TBuicHKOVm9hxTifLARJZFxZzXDCeuQBvDoE1++0EH5GujtpKT1kgZZsgpesvggLok 7JG61cCw7kNuPb0k9/rP+6n5hyMXuJB2wG3SwrrgB2i6MMpKRg7GRPbbFj1QNWZJmNt+ fxfdv49V+pcMpNjAhUihezyuNYRWTImjuFM4BNhWqJXHhuGqxeXcHQc0fikX6Tk72PR5 CvLyhmjR2CqrVEi8t8ANJPTki+XxeXXzbTQ7Bui9BevwElOi4qTy3dvLjufnB9j/wfA/ EtsUul/N5KmfSmLmD8UGbIkRE6FgUQ4yfPAXrBm+lCzyh02mKmpWCfLePmqZLxah2fOS Djug== 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=zaChLvpV1bYStSPvXlAV7o8JyBUldM/i5tXZW+WmTms=; b=6+XuVeDsIt0oa8Aabp1Tr+cWQ32ZU0lX5C3ex7tpezhW7rWehVURNiHm3uhuL6FVm7 IrNiCOsvsaKoO5JVlhsS+zzvJveNrDbWCBkGJIn4VH3yTidgNi2S2SGQWth3hG055JQh MmDV3Mw/seYl45Rb8C8DV8eK8hG4xYY/UpE87yaIRF0KLdnD3tM0WL1UNbvAZnqwtU9H PmX0IOIPGqMUstlBXz3/P7r1iGTFVVgSbx4tZ/YMaUimJXfZW3sRdRa6sZXWCAeXRJmC aBSQ85Ji+2vpxpmOB0VWCl/BCusIuzfj/sg0zfeQDnVOwVUY4r7VRt3/U3pV2SHb5GQy SpdA== X-Gm-Message-State: ACgBeo1Pii7JleMc83zYDqwGeYlkTraxMec6PPH1rKR+AISVvqRtypag P/ge6M4kXP7HbPcWoMlKF1E= X-Google-Smtp-Source: AA6agR7OprjbhDKxGLyattb47jG+WINF2cy81gni7eGMLHh4O0iL2ao/Rl3jOP8NNApcyyhdkhhcGg== X-Received: by 2002:a05:6402:3892:b0:43b:d872:a66 with SMTP id fd18-20020a056402389200b0043bd8720a66mr6075765edb.139.1660913684340; Fri, 19 Aug 2022 05:54:44 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id b12-20020a056402138c00b0043d6ece495asm3000955edv.55.2022.08.19.05.54.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 05:54: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 09/11] staging: r8188eu: merge rtw_{os,}_indicate_connect() Date: Fri, 19 Aug 2022 14:54:26 +0200 Message-Id: <20220819125428.8412-10-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220819125428.8412-1-straube.linux@gmail.com> References: <20220819125428.8412-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 rtw_os_indicate_connect() into rtw_indicate_connect(). It looks like the driver was originaly written to support different operating systems. We do not need this wrapping into an extra _os_ function obviously. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme.c | 5 ++++- drivers/staging/r8188eu/include/mlme_osdep.h | 1 - drivers/staging/r8188eu/os_dep/mlme_linux.c | 10 ---------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 3050c85dec2c..bd86fb679d63 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -851,7 +851,10 @@ void rtw_indicate_connect(struct adapter *padapter) =20 rtw_led_control(padapter, LED_CTL_LINK); =20 - rtw_os_indicate_connect(padapter); + rtw_indicate_wx_assoc_event(padapter); + netif_carrier_on(padapter->pnetdev); + if (padapter->pid[2] !=3D 0) + rtw_signal_process(padapter->pid[2], SIGALRM); } =20 pmlmepriv->to_roaming =3D 0; diff --git a/drivers/staging/r8188eu/include/mlme_osdep.h b/drivers/staging= /r8188eu/include/mlme_osdep.h index 9cee84acff6b..5f63e2051419 100644 --- a/drivers/staging/r8188eu/include/mlme_osdep.h +++ b/drivers/staging/r8188eu/include/mlme_osdep.h @@ -8,7 +8,6 @@ #include "drv_types.h" =20 void rtw_init_mlme_timer(struct adapter *padapter); -void rtw_os_indicate_connect(struct adapter *adapter); void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted); =20 void indicate_wx_scan_complete_event(struct adapter *padapter); diff --git a/drivers/staging/r8188eu/os_dep/mlme_linux.c b/drivers/staging/= r8188eu/os_dep/mlme_linux.c index d439ffaf9797..105251f250dc 100644 --- a/drivers/staging/r8188eu/os_dep/mlme_linux.c +++ b/drivers/staging/r8188eu/os_dep/mlme_linux.c @@ -38,16 +38,6 @@ void rtw_init_mlme_timer(struct adapter *padapter) timer_setup(&pmlmepriv->dynamic_chk_timer, _dynamic_check_timer_handlder,= 0); } =20 -void rtw_os_indicate_connect(struct adapter *adapter) -{ - - rtw_indicate_wx_assoc_event(adapter); - netif_carrier_on(adapter->pnetdev); - if (adapter->pid[2] !=3D 0) - rtw_signal_process(adapter->pid[2], SIGALRM); - -} - void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted) { indicate_wx_scan_complete_event(padapter); --=20 2.37.1 From nobody Fri Apr 10 20:15:43 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 97B28C32771 for ; Fri, 19 Aug 2022 12:56:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349282AbiHSM4R (ORCPT ); Fri, 19 Aug 2022 08:56:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349170AbiHSMy7 (ORCPT ); Fri, 19 Aug 2022 08:54:59 -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 B1C455A88A for ; Fri, 19 Aug 2022 05:54:46 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id r4so5544576edi.8 for ; Fri, 19 Aug 2022 05:54: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=MXV4DylOF0ZdaiLo2QJuGxzw6UXL1e8It7jaBClcFvg=; b=osiPXDjtr2ryf+P6+tDShDm6e+MFPpDx47vXUDtsOoJPTedOqf/j96FBlkhOYqtROd XwPx+LuduCt8UHcnYqZ+hGJDHj3TcNA2Mn317Ng/3QlG2RVrlyUgEN5gtzW/gCFD7nm4 PTCxowDthgLU/Pa4KL+/G+1jyTwzC2ghWvEsuX17Dn2/AjOCqP5bH8+mP2UTPZiOERHc ZI6Bfiwz0rZhtD8TOGmgJRjIv9/IQPFc51Pv+TgQ0qq4PVdgJdYKOSWNhnxWglpVH+i5 cfuLuiMo5bimaS6P5i5K24pk4PKOEi9HDw6IGvBLvYzv3St9Mn0pRjpYdnNPfbQE7bVf NtwA== 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=MXV4DylOF0ZdaiLo2QJuGxzw6UXL1e8It7jaBClcFvg=; b=vSygUP7QsXxXuMkfoytqsLNqoI25+YrF940GLCM8WMrhqxUqBps2o6h4e19UFgrKH6 KXfAV/3zqMEaSI4ep1wtJEJXQTHhjlcMUxG0CiDO/7Nw2uedLZVWBRzYHcX8OPZltXJH Fd8Yw0YdZTBWPne/Uw+RkNUWQ4Ei+jQuKhD3vKIAJfO9TDykALth2/eFwcs3rHHwCRWx 4y7bs4As+q31jsCg12w767lx1Y43rRd0togkTTIwCHDJSRhYCyCdiQy1Ubs0BKcP+Boc 5w1id3mD24ljeQJvEh/iotL435NVNLehdbeyhgVWDbyohpUSGMCv/KWZrUHpTHN7IwMU ptIQ== X-Gm-Message-State: ACgBeo2TkZk+XA2v7ZxkYi32hhoJkL1gv9QOgOcShdcz6XxTZR8mJwzB pQgVmgWWSy4Ma2RkLhXsPIk= X-Google-Smtp-Source: AA6agR7Q+W+RLgMxyIBfSNlTMD3yN5X4f110uXeDFuTtojrjd5h0HtViZ742+1fDJKRBkAGgKtZLbw== X-Received: by 2002:a05:6402:e01:b0:442:dd7e:f49d with SMTP id h1-20020a0564020e0100b00442dd7ef49dmr5958364edh.355.1660913684914; Fri, 19 Aug 2022 05:54:44 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id b12-20020a056402138c00b0043d6ece495asm3000955edv.55.2022.08.19.05.54.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 05:54: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 10/11] staging: r8188eu: merge rtw_{os,}_indicate_scan_done() Date: Fri, 19 Aug 2022 14:54:27 +0200 Message-Id: <20220819125428.8412-11-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220819125428.8412-1-straube.linux@gmail.com> References: <20220819125428.8412-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 rtw_os_indicate_scan_done() into rtw_indicate_scan_done(). It looks like the driver was originaly written to support different operating systems. We do not need this wrapping into an extra _os_ function obviously. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme.c | 2 +- drivers/staging/r8188eu/include/mlme_osdep.h | 1 - drivers/staging/r8188eu/os_dep/mlme_linux.c | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index bd86fb679d63..594bfaf27291 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -894,7 +894,7 @@ void rtw_indicate_disconnect(struct adapter *padapter) =20 inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted) { - rtw_os_indicate_scan_done(padapter, aborted); + indicate_wx_scan_complete_event(padapter); } =20 static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapte= r, struct wlan_network *pnetwork) diff --git a/drivers/staging/r8188eu/include/mlme_osdep.h b/drivers/staging= /r8188eu/include/mlme_osdep.h index 5f63e2051419..d5e367e2d0de 100644 --- a/drivers/staging/r8188eu/include/mlme_osdep.h +++ b/drivers/staging/r8188eu/include/mlme_osdep.h @@ -8,7 +8,6 @@ #include "drv_types.h" =20 void rtw_init_mlme_timer(struct adapter *padapter); -void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted); =20 void indicate_wx_scan_complete_event(struct adapter *padapter); =20 diff --git a/drivers/staging/r8188eu/os_dep/mlme_linux.c b/drivers/staging/= r8188eu/os_dep/mlme_linux.c index 105251f250dc..5bd2b2c31342 100644 --- a/drivers/staging/r8188eu/os_dep/mlme_linux.c +++ b/drivers/staging/r8188eu/os_dep/mlme_linux.c @@ -37,8 +37,3 @@ void rtw_init_mlme_timer(struct adapter *padapter) timer_setup(&pmlmepriv->scan_to_timer, _rtw_scan_timeout_handler, 0); timer_setup(&pmlmepriv->dynamic_chk_timer, _dynamic_check_timer_handlder,= 0); } - -void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted) -{ - indicate_wx_scan_complete_event(padapter); -} --=20 2.37.1 From nobody Fri Apr 10 20:15:43 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 2A76DC32772 for ; Fri, 19 Aug 2022 12:56:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348803AbiHSM4V (ORCPT ); Fri, 19 Aug 2022 08:56:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349206AbiHSMzA (ORCPT ); Fri, 19 Aug 2022 08:55:00 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 559848E47C for ; Fri, 19 Aug 2022 05:54:47 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id r4so5544610edi.8 for ; Fri, 19 Aug 2022 05:54: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=2SSQQj013RZlWs9wGfRUXVrA/uDJ2ngKJB6u8ISOGaE=; b=JJ4mn9dpVZCHQgmmlBB7iE/PtFScritoSfe3Tk+m16DWWi5JCKdk2G8ULV6HYJVZ1i HDW1TCFfd65Ul3lNPcBxQ2Bmi3Kqib+p2YmVEtizr6rBuRAXCFfwxvKCL6tsDruGcOvT J8TfqT8HRdJUZOox0rUHHeTqQ219DaRr7tzMIS0NXGPZb1751i3rGpKRvXecGG22aLDX D5p0RNsZkhWETnEvnJP94RMdwwBD9MvELidiC/tiQlUv/ZUPlBM4jrhwma5L75HjtFOB 1tuIdZlJL1khgAlK1p3JHF6yscaW4Myb4AA73V2N9x7dvNO6sM8cGhGjbeQwrdO6vsU6 n52w== 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=2SSQQj013RZlWs9wGfRUXVrA/uDJ2ngKJB6u8ISOGaE=; b=j57e5tF+/NIwCMAEKCBZbsOEPkh5IzdoUWc/S3Zp1I1qke1W1aq20T/IltkPdESnaU Qds0ti/yMce3Rc458e2DsN0d5YcEQSXCpCYsT5RpzR/A3i/nyJ1tNGqW22VNAOTdUXQ9 ncZDiY8GkNvGsxmMXDo9N6yQMJGIFmxNj41oJZ+LolnEO/StcN2B5eaOOVr5hmuAxgGq 3d/kXFn/llhlt7quhMghEY/90ru+ymr1147//wHUtclj9IZDSmZLYZM8RJHW55/Zgv0w 6qSnqPyJ31i5bzK0OmEIfG+gDYRVb5fbpOFKT7pcYjGMwvIDfAmpgOXMULeUVGreVKcY dhkQ== X-Gm-Message-State: ACgBeo0KpzTIjcyo8y9yh5Ia2ot0uf6pUaYKwUzpNcnjpO6S2pLqv8cN KYUWdP2w7CJ1c4Nv0X6Eq9w= X-Google-Smtp-Source: AA6agR640Zqbr9KTJsVpoK9esFUqHVA5whNVRnpPA92sbodIBfc8lyacbTEKhtzBe9tJzACmNVZgqA== X-Received: by 2002:a05:6402:353:b0:446:2d2c:3854 with SMTP id r19-20020a056402035300b004462d2c3854mr3527186edw.193.1660913685528; Fri, 19 Aug 2022 05:54:45 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb77.dynamic.kabel-deutschland.de. [95.90.187.119]) by smtp.gmail.com with ESMTPSA id b12-20020a056402138c00b0043d6ece495asm3000955edv.55.2022.08.19.05.54.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 05:54: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 11/11] staging: r8188eu: remove unused function parameter Date: Fri, 19 Aug 2022 14:54:28 +0200 Message-Id: <20220819125428.8412-12-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220819125428.8412-1-straube.linux@gmail.com> References: <20220819125428.8412-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 parameter 'aborted' of rtw_indicate_scan_done() is not used. Remove it. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme.c | 4 ++-- drivers/staging/r8188eu/include/rtw_mlme.h | 2 +- drivers/staging/r8188eu/os_dep/usb_intf.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 594bfaf27291..e3cf3e8962fb 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -892,7 +892,7 @@ void rtw_indicate_disconnect(struct adapter *padapter) =20 } =20 -inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted) +inline void rtw_indicate_scan_done(struct adapter *padapter) { indicate_wx_scan_complete_event(padapter); } @@ -1365,7 +1365,7 @@ void rtw_scan_timeout_handler (struct adapter *adapte= r) spin_lock_bh(&pmlmepriv->lock); _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); spin_unlock_bh(&pmlmepriv->lock); - rtw_indicate_scan_done(adapter, true); + rtw_indicate_scan_done(adapter); } =20 static void rtw_auto_scan_handler(struct adapter *padapter) diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r= 8188eu/include/rtw_mlme.h index d81668498e46..e8168e36fac2 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme.h +++ b/drivers/staging/r8188eu/include/rtw_mlme.h @@ -537,7 +537,7 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct= __queue *scanned_queue); void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_qu= eue); void rtw_indicate_disconnect(struct adapter *adapter); void rtw_indicate_connect(struct adapter *adapter); -void rtw_indicate_scan_done( struct adapter *padapter, bool aborted); +void rtw_indicate_scan_done(struct adapter *padapter); =20 int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len); diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8= 188eu/os_dep/usb_intf.c index a52d1553acdd..0c752cf0c6c5 100644 --- a/drivers/staging/r8188eu/os_dep/usb_intf.c +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c @@ -231,7 +231,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf,= pm_message_t message) mutex_unlock(&pwrpriv->lock); =20 if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) - rtw_indicate_scan_done(padapter, 1); + rtw_indicate_scan_done(padapter); =20 if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) rtw_indicate_disconnect(padapter); --=20 2.37.1