LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v2] staging: r8188eu: core: remove duplicate structure
@ 2021-09-10  6:21 Saurav Girepunje
  2021-09-13 16:18 ` Greg KH
  0 siblings, 1 reply; 2+ messages in thread
From: Saurav Girepunje @ 2021-09-10  6:21 UTC (permalink / raw)
  To: Larry.Finger, phil, gregkh, straube.linux, saurav.girepunje,
	fmdefrancesco, linux-staging, linux-kernel
  Cc: saurav.girepunje

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 <saurav.girepunje@gmail.com>
---

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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] staging: r8188eu: core: remove duplicate structure
  2021-09-10  6:21 [PATCH v2] staging: r8188eu: core: remove duplicate structure Saurav Girepunje
@ 2021-09-13 16:18 ` Greg KH
  0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2021-09-13 16:18 UTC (permalink / raw)
  To: Saurav Girepunje
  Cc: Larry.Finger, phil, straube.linux, fmdefrancesco, linux-staging,
	linux-kernel, saurav.girepunje

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 <saurav.girepunje@gmail.com>
> ---
> 
> 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 :(

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-09-13 16:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-10  6:21 [PATCH v2] staging: r8188eu: core: remove duplicate structure Saurav Girepunje
2021-09-13 16:18 ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).