From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, FSL_NEW_HELO_USER,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 913F8C433EF for ; Fri, 10 Sep 2021 06:21:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7279761026 for ; Fri, 10 Sep 2021 06:21:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231191AbhIJGWv (ORCPT ); Fri, 10 Sep 2021 02:22:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230450AbhIJGWt (ORCPT ); Fri, 10 Sep 2021 02:22:49 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D81AFC061574 for ; Thu, 9 Sep 2021 23:21:38 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id c13-20020a17090a558d00b00198e6497a4fso752558pji.4 for ; Thu, 09 Sep 2021 23:21:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=YZ1Cg3jt7kSg/s1Z6W7j84UpRGbFtuFXUdAmMNqttek=; b=pbBh2lafzMJ8pxp+1se+PF13P2h8nvIrrXnsc+fXSy/Oem1T2BRrXwSg0C5CQD2NQu VbNYxlYunBJZUaEXaGzIQh/Oaq5tXnCbL58yAKdWdHewniJ2v6kdsZwM9VxBHJU76Kyj g9cMZmRVeVAl7oy40nl9BzN7Voj6taD7U2ocrFfZMhjxwaK7Z+MpyRLjNts9oSx8FXVU K/ep3uVQlxHIdXILQsFTaKTpyioeYn2fgzAuHwCih9UI1qe9L/DXWOxtnevTdZBGvaGZ LM3g926xWS56jNLGuLF1SxKji//fb5PS/ZsSMKu8Iqx+tXfe8M+DGru4WBvTMvm4GMiJ sKig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=YZ1Cg3jt7kSg/s1Z6W7j84UpRGbFtuFXUdAmMNqttek=; b=UiH6OUzzm2BZ66umzHjnZPQwBV4zVDgQojQsWC5AGOduiS1dUEFUi2WDkOuP7cTbq5 H0JslAjHVUNnxw8DHYUBx+w6nBdS0LbMZ3gWTiKAJznSUlsdA7gLn1hdSExFB9oqgnPT PpMRGzLwZN/WC9KJXTI/QZJgiqWYu1RIpww7O72BO+3iYR0l+jFJgFZNT8F9BnhkQvXW DqF/zZzEIcJO1idL6wyT6OH3xSldVTAikW2cmVxYAiVBZW9bdSGdIJzqc72HOpO+bdxI Wd78S1Mcl5mMElgx03eucApLMmJbLJ1HiWNlCdf72K6nlBFx9m2Ep2lvl7VbPG6dvdNY wF3Q== X-Gm-Message-State: AOAM533MpqN90S5WRzu65n9PER4esHPJkp2a8RSS+I0BTRJZ0ujJm+xA OgE8rYeVj/5K8JP3O1P/k/h8uIeohcX2Fg== X-Google-Smtp-Source: ABdhPJwUgdwGRc1oUeS6iivmnlzKwt980w8DajfjUlPGPVCR2WPjnS94g4QYxvhHSg9Y1SGLH5k79A== X-Received: by 2002:a17:90b:1b06:: with SMTP id nu6mr7749738pjb.15.1631254898261; Thu, 09 Sep 2021 23:21:38 -0700 (PDT) Received: from user ([117.98.200.228]) by smtp.gmail.com with ESMTPSA id b10sm2922570pfl.220.2021.09.09.23.21.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Sep 2021 23:21:37 -0700 (PDT) Date: Fri, 10 Sep 2021 11:51:32 +0530 From: Saurav Girepunje To: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, gregkh@linuxfoundation.org, straube.linux@gmail.com, saurav.girepunje@gmail.com, fmdefrancesco@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: saurav.girepunje@hotmail.com Subject: [PATCH v2] staging: r8188eu: core: remove duplicate structure Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove duplicate structure mlme_handler. struct action_handler and mlme_handler both are having same member. Replace mlme_handler with action_handler. Signed-off-by: Saurav Girepunje --- ChangeLog V2: - Replace the struct mlme_handler by action_handler. ChangeLog V1: -Remove duplicate structure mlme_handler and action_handler. Both structure are having same member. Replace it with mlme_action_handler. drivers/staging/r8188eu/core/rtw_mlme_ext.c | 6 +++--- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c index f314f55997bf..499eda43fd69 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -11,7 +11,7 @@ #include "../include/mlme_osdep.h" #include "../include/recv_osdep.h" -static struct mlme_handler mlme_sta_tbl[] = { +static struct action_handler mlme_sta_tbl[] = { {WIFI_ASSOCREQ, "OnAssocReq", &OnAssocReq}, {WIFI_ASSOCRSP, "OnAssocRsp", &OnAssocRsp}, {WIFI_REASSOCREQ, "OnReAssocReq", &OnAssocReq}, @@ -391,7 +391,7 @@ void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext) } } -static void _mgt_dispatcher(struct adapter *padapter, struct mlme_handler *ptable, struct recv_frame *precv_frame) +static void _mgt_dispatcher(struct adapter *padapter, struct action_handler *ptable, struct recv_frame *precv_frame) { u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 *pframe = precv_frame->rx_data; @@ -408,7 +408,7 @@ static void _mgt_dispatcher(struct adapter *padapter, struct mlme_handler *ptabl void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame) { int index; - struct mlme_handler *ptable; + struct action_handler *ptable; #ifdef CONFIG_88EU_AP_MODE struct mlme_priv *pmlmepriv = &padapter->mlmepriv; #endif /* CONFIG_88EU_AP_MODE */ diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h index d2f4d3ce7b90..6175abbc5029 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -213,12 +213,6 @@ enum SCAN_STATE { SCAN_STATE_MAX, }; -struct mlme_handler { - unsigned int num; - char *str; - unsigned int (*func)(struct adapter *adapt, struct recv_frame *frame); -}; - struct action_handler { unsigned int num; char* str; -- 2.32.0