Received: by 2002:a05:6a10:6d25:0:0:0:0 with SMTP id gq37csp1979933pxb; Mon, 13 Sep 2021 09:22:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEn0x6WuVoGwwpkYWYxAHh+VzR5+x2SFgoZgzewMprw/EOemMjFV+BZQOQgRhA2E08Ljhp X-Received: by 2002:aa7:c945:: with SMTP id h5mr14106069edt.350.1631550165041; Mon, 13 Sep 2021 09:22:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631550165; cv=none; d=google.com; s=arc-20160816; b=EYIoJqxyEDDy0jCanYv8sYUtq7fpo9Mka63jHAgI5/N91ASyRN1ooCqYwFi1PFuNKv OH32DsD5INQsXFSbLN+KjGPs1Q2pAv7hiMlk7DFC58mM9RNe56ZE/OT+0Tm+m811c6k0 2xQxdLqrTmxKWaTcW5Lo6iZBRB01XTrUfBViaL5KZmYHHkYqSlW9s45+DNqd7/fkJLY+ 3ivhUGZHw6WLn09wOZ+Jw4YQidbNRs1VjyKycxPp85uSL7pzOpxYs7XvN2wtttVp/J+0 FYsJdFy8qsh4BYNKME6YjU9KfwudpeDNnfLABSI86++bRYwaeaFFdakXcMuLow16kFBE 6TOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=/0Oq6XxYU4QdbIscwXzmeaWHZQGXE2SupnxsjPdp/TQ=; b=bGhEidLHAsanU3T9WKUJjfExG/Tlj1FEYRpI/Fg84toRFce3bRNthOxp9gYl01GWUq OOY36MbL6PJ2tLvTc1R6MNDcapygX3Ima6o/NWhRbYkowuICSF8OBG91ApCbfavmDf7N bxuqnzDhbSw3pzxqYDloAvkPo+SwkQRzFfE4QPcGY92LxL2rIIeHltfJ1nqGrLMBTIAH Z4RdMn8qcZg/n1eBoRz96zzKk7gvqdgLfFWfc/mTMq/XRk59yWqFebosA6SvLRvAbtMd ptyoc/kzNm3GRB8Q9r3APDp9PvGOf7LMB5gxjCaaJJakqQox8Q8L1r2F61rda+P/P2h1 JTpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LPf44SZn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bu17si7686596ejb.722.2021.09.13.09.22.19; Mon, 13 Sep 2021 09:22:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LPf44SZn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229833AbhIMQTc (ORCPT + 99 others); Mon, 13 Sep 2021 12:19:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:53818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236979AbhIMQTW (ORCPT ); Mon, 13 Sep 2021 12:19:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7AADA60EE5; Mon, 13 Sep 2021 16:18:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631549886; bh=rJMsrnQNM4V/ZM9eTs/LduMrJob3pRjAi6xGqx/5sCU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LPf44SZnWjqq6xIiyWeQgrK8K40B0vJuOQi/I9tVqhy/1tXMkowOq1iFRdcNvkvb4 /bhZ7qZbj+Z3Vb1fZwQqeJekjQ5gmjJtQ0xAmWrbNNrEn33Nkdgl0mZ4XAJWYbq7g8 C12Hn94QqHenMT2Q03jTnSjA/gJntUePYA4mooUE= Date: Mon, 13 Sep 2021 18:18:04 +0200 From: Greg KH To: Saurav Girepunje Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, straube.linux@gmail.com, fmdefrancesco@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, saurav.girepunje@hotmail.com Subject: Re: [PATCH v2] staging: r8188eu: core: remove duplicate structure Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Sep 10, 2021 at 11:51:32AM +0530, Saurav Girepunje wrote: > 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 > > Does not apply to my tree :(