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 7D141C433FE for ; Sun, 5 Sep 2021 11:04:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 481DB60EE6 for ; Sun, 5 Sep 2021 11:04:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237661AbhIELEW (ORCPT ); Sun, 5 Sep 2021 07:04:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230145AbhIELEU (ORCPT ); Sun, 5 Sep 2021 07:04:20 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0298C061575 for ; Sun, 5 Sep 2021 04:03:17 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id i13so2496720pjv.5 for ; Sun, 05 Sep 2021 04:03:17 -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=F+xPQAG2VCz0ftgXUmW/nU/xJftUNz0rnEDvPM4auEk=; b=XBIo81MCIrrD6Cfqy1PeMIpjqjqSE1jINHws04cjn7Z8V0lkUrqKTC5cGDFjjHMUul 1sNIMppfB9jwR3EbF/OWJWXOApx0ABOJNiqvIyIB2ADOYA7b0A0Ya5J1L2mFcmoCX2Iz A4yEFgR+FkoU6dS+KeBqSyqfdDS7QJvH+6RddhHDzc/vFcjF9yPYVADB0TiIxe4iDuQ1 QMYSwJfNl5Z4/CBR7ilwVyzYJr5fG+WpopOa6HCDncmaSg/ly09i3aOD36HmPcvjbIZ0 oaYuEmBG1vhwFt79IDL176RiEgXwMDW1ATD8ryt4AK/T4KmZZW9y08DF8vH8ch66vt8S ISog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=F+xPQAG2VCz0ftgXUmW/nU/xJftUNz0rnEDvPM4auEk=; b=rkN/fXngTNZjnAh81dUy+cv1m2mCCyUFjWMthgEGmPr6dEx5eM4PBoPqae3J5WcOsq BL3WzsiAX5bMscr7cpqZGGXxMpRs5FMWa67jPiUzX6oHJzAGDN34xCt28MeGE9LDgt9z Ey4uZzjGyWFsfS9XROJI5j/IBv3rXgGIbUduHT/dE6mzaraLe9ViazDkvFkuWYX+oVFR 52YmL19szTH6rvwjaxNbApq1xcSLPQkBwp96HV6TcvwhJpYHvyNsvGWkCcwa9Umwcp0D kPIl5oFuJGJfkzVJ+rp4nDY5cawTmjv6JyNU5qFsBGMkWf5+ToRxAbDdVXb4kBRvGmwU 0VmQ== X-Gm-Message-State: AOAM532Lxx/VMubLXAOe+28cwS9KbfYmQbREnJ/QQLnKuQkT0XXdRsu4 Dd1T1zUQJGrMfeq/p666QbQ= X-Google-Smtp-Source: ABdhPJwRVzN1UQdDZoQAtCTNNbwASO2y3XlFjHDXQ5IxzSIiC2hEWufYD24Smli2BGgwO3i3v+XDLg== X-Received: by 2002:a17:902:8f83:b0:138:9186:71d7 with SMTP id z3-20020a1709028f8300b00138918671d7mr6474891plo.56.1630839797185; Sun, 05 Sep 2021 04:03:17 -0700 (PDT) Received: from user ([117.98.200.228]) by smtp.gmail.com with ESMTPSA id n185sm4733863pfn.171.2021.09.05.04.03.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Sep 2021 04:03:16 -0700 (PDT) Date: Sun, 5 Sep 2021 16:33:10 +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] 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 and action_handler. Both structure are having same member. Replace it with mlme_action_handler. Signed-off-by: Saurav Girepunje --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 12 ++++++------ drivers/staging/r8188eu/include/rtw_mlme_ext.h | 8 +------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c index f314f55997bf..6529f7ece5e2 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 mlme_action_handler mlme_sta_tbl[] = { {WIFI_ASSOCREQ, "OnAssocReq", &OnAssocReq}, {WIFI_ASSOCRSP, "OnAssocRsp", &OnAssocRsp}, {WIFI_REASSOCREQ, "OnReAssocReq", &OnAssocReq}, @@ -32,7 +32,7 @@ static struct mlme_handler mlme_sta_tbl[] = { {WIFI_ACTION, "OnAction", &OnAction}, }; -static struct action_handler OnAction_tbl[] = { +static struct mlme_action_handler OnAction_tbl[] = { {RTW_WLAN_CATEGORY_SPECTRUM_MGMT, "ACTION_SPECTRUM_MGMT", on_action_spct}, {RTW_WLAN_CATEGORY_QOS, "ACTION_QOS", &OnAction_qos}, {RTW_WLAN_CATEGORY_DLS, "ACTION_DLS", &OnAction_dls}, @@ -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 mlme_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 mlme_action_handler *ptable; #ifdef CONFIG_88EU_AP_MODE struct mlme_priv *pmlmepriv = &padapter->mlmepriv; #endif /* CONFIG_88EU_AP_MODE */ @@ -4221,7 +4221,7 @@ unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_frame) { int i; unsigned char category; - struct action_handler *ptable; + struct mlme_action_handler *ptable; unsigned char *frame_body; u8 *pframe = precv_frame->rx_data; @@ -4229,7 +4229,7 @@ unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_frame) category = frame_body[0]; - for (i = 0; i < sizeof(OnAction_tbl) / sizeof(struct action_handler); i++) { + for (i = 0; i < sizeof(OnAction_tbl) / sizeof(struct mlme_action_handler); i++) { ptable = &OnAction_tbl[i]; if (category == ptable->num) ptable->func(padapter, precv_frame); diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h index d2f4d3ce7b90..99ee28e4c500 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -213,18 +213,12 @@ enum SCAN_STATE { SCAN_STATE_MAX, }; -struct mlme_handler { +struct mlme_action_handler { unsigned int num; char *str; unsigned int (*func)(struct adapter *adapt, struct recv_frame *frame); }; -struct action_handler { - unsigned int num; - char* str; - unsigned int (*func)(struct adapter *adapt, struct recv_frame *frame); -}; - struct ss_res { int state; int bss_cnt; -- 2.32.0