2022-10-26 10:47:59

by Deepak R Varma

Subject: [PATCH 1/2] staging: rtl8192u: remove unnecessary function implementation

Current implementation of function ieee80211_tkip_null simply returns
back to the caller without any useful instruction executions. This makes
the function call and its implementation unnecessary and should be
removed.

Signed-off-by: Deepak R Varma <[email protected]>
---
drivers/staging/rtl8192u/ieee80211/ieee80211.h | 3 ---
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 6 ------
drivers/staging/rtl8192u/ieee80211/ieee80211_module.c | 3 ---
3 files changed, 12 deletions(-)

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
index 9cd4b1896745..00c07455cbb3 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
@@ -232,8 +232,6 @@ struct cb_desc {

#define ieee80211_ccmp_null ieee80211_ccmp_null_rsl

-#define ieee80211_tkip_null ieee80211_tkip_null_rsl
-
#define free_ieee80211 free_ieee80211_rsl
#define alloc_ieee80211 alloc_ieee80211_rsl

@@ -2256,7 +2254,6 @@ void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success);
void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee);

/* ieee80211_crypt_ccmp&tkip&wep.c */
-void ieee80211_tkip_null(void);

int ieee80211_crypto_init(void);
void ieee80211_crypto_deinit(void);
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
index 7b120b8cb982..9bfd24ad46b6 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
@@ -716,9 +716,3 @@ void ieee80211_crypto_tkip_exit(void)
{
ieee80211_unregister_crypto_ops(&ieee80211_crypt_tkip);
}
-
-void ieee80211_tkip_null(void)
-{
-// printk("============>%s()\n", __func__);
- return;
-}
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
index b94fe9b449b6..3f93939bc4ee 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
@@ -159,9 +159,6 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
ieee->last_packet_time[i] = 0;
}

-/* These function were added to load crypte module autoly */
- ieee80211_tkip_null();
-
return dev;

failed:
--
2.30.2

2022-10-26 11:05:11

by Greg Kroah-Hartman

Subject: Re: [PATCH 1/2] staging: rtl8192u: remove unnecessary function implementation

On Wed, Oct 26, 2022 at 08:57:48AM +0530, Deepak R Varma wrote:
> Current implementation of function ieee80211_tkip_null simply returns
> back to the caller without any useful instruction executions. This makes
> the function call and its implementation unnecessary and should be
> removed.
>
> Signed-off-by: Deepak R Varma <[email protected]>
> ---
> drivers/staging/rtl8192u/ieee80211/ieee80211.h | 3 ---
> drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 6 ------
> drivers/staging/rtl8192u/ieee80211/ieee80211_module.c | 3 ---
> 3 files changed, 12 deletions(-)
>
> diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
> index 9cd4b1896745..00c07455cbb3 100644
> --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
> +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
> @@ -232,8 +232,6 @@ struct cb_desc {
>
> #define ieee80211_ccmp_null ieee80211_ccmp_null_rsl
>
> -#define ieee80211_tkip_null ieee80211_tkip_null_rsl
> -
> #define free_ieee80211 free_ieee80211_rsl
> #define alloc_ieee80211 alloc_ieee80211_rsl
>
> @@ -2256,7 +2254,6 @@ void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success);
> void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee);
>
> /* ieee80211_crypt_ccmp&tkip&wep.c */
> -void ieee80211_tkip_null(void);
>
> int ieee80211_crypto_init(void);
> void ieee80211_crypto_deinit(void);
> diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
> index 7b120b8cb982..9bfd24ad46b6 100644
> --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
> +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
> @@ -716,9 +716,3 @@ void ieee80211_crypto_tkip_exit(void)
> {
> ieee80211_unregister_crypto_ops(&ieee80211_crypt_tkip);
> }
> -
> -void ieee80211_tkip_null(void)
> -{
> -// printk("============>%s()\n", __func__);
> - return;
> -}
> diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
> index b94fe9b449b6..3f93939bc4ee 100644
> --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
> +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
> @@ -159,9 +159,6 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
> ieee->last_packet_time[i] = 0;
> }
>
> -/* These function were added to load crypte module autoly */
> - ieee80211_tkip_null();
> -

Ah, but this was created on purpose, did you now break the module
autoloading here? Is this built as a separate module or is it all one
big module?

You need to explain why this does not change functionality in your
changelog text.

thanks,

greg k-h

2022-10-26 13:00:52

by Deepak R Varma

Subject: Re: [PATCH 1/2] staging: rtl8192u: remove unnecessary function implementation

On Wed, Oct 26, 2022 at 12:44:36PM +0200, Greg Kroah-Hartman wrote:
> On Wed, Oct 26, 2022 at 08:57:48AM +0530, Deepak R Varma wrote:
> > Current implementation of function ieee80211_tkip_null simply returns
> > back to the caller without any useful instruction executions. This makes
> > the function call and its implementation unnecessary and should be
> > removed.
> >
> > Signed-off-by: Deepak R Varma <[email protected]>
> > ---
> > drivers/staging/rtl8192u/ieee80211/ieee80211.h | 3 ---
> > drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 6 ------
> > drivers/staging/rtl8192u/ieee80211/ieee80211_module.c | 3 ---
> > 3 files changed, 12 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
> > index 9cd4b1896745..00c07455cbb3 100644
> > --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
> > +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
> > @@ -232,8 +232,6 @@ struct cb_desc {
> >
> > #define ieee80211_ccmp_null ieee80211_ccmp_null_rsl
> >
> > -#define ieee80211_tkip_null ieee80211_tkip_null_rsl
> > -
> > #define free_ieee80211 free_ieee80211_rsl
> > #define alloc_ieee80211 alloc_ieee80211_rsl
> >
> > @@ -2256,7 +2254,6 @@ void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success);
> > void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee);
> >
> > /* ieee80211_crypt_ccmp&tkip&wep.c */
> > -void ieee80211_tkip_null(void);
> >
> > int ieee80211_crypto_init(void);
> > void ieee80211_crypto_deinit(void);
> > diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
> > index 7b120b8cb982..9bfd24ad46b6 100644
> > --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
> > +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
> > @@ -716,9 +716,3 @@ void ieee80211_crypto_tkip_exit(void)
> > {
> > ieee80211_unregister_crypto_ops(&ieee80211_crypt_tkip);
> > }
> > -
> > -void ieee80211_tkip_null(void)
> > -{
> > -// printk("============>%s()\n", __func__);
> > - return;
> > -}
> > diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
> > index b94fe9b449b6..3f93939bc4ee 100644
> > --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
> > +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
> > @@ -159,9 +159,6 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
> > ieee->last_packet_time[i] = 0;
> > }
> >
> > -/* These function were added to load crypte module autoly */
> > - ieee80211_tkip_null();
> > -
>
> Ah, but this was created on purpose, did you now break the module
> autoloading here? Is this built as a separate module or is it all one
> big module?

Looks like a one big module on the kernel I built post this change. I looked
into the modules.dep file for dependencies. I was able to load the driver
r8192u_usb using modprobe without any issues.

Let me know if I should be looking at something else to validate your concern.

>
> You need to explain why this does not change functionality in your
> changelog text.

Okay. I will work on it and send in a revision.

>
> thanks,
>
> greg k-h
>