* [PATCH v2] staging: rtl8192u: ieee80211: renamed duplicate variable
@ 2023-09-28 3:32 Gary Rookard
2023-09-28 4:57 ` Philipp Hortmann
2023-09-28 4:58 ` Dan Carpenter
0 siblings, 2 replies; 3+ messages in thread
From: Gary Rookard @ 2023-09-28 3:32 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, Gary Rookard
This patch renames a duplicate variable found in both rtl8192e and
rtl8192u causing the preprocesser/compiler to compile without error
when in fact it should throw an error/break the build.
Prototype in files:
rtl8192e/rtllib.h remaining as ht_update_default_setting
rtl8192u/ieee80211/ieee80211.h changed to __ht_update_default_setting
Function in files:
rtl8192e/rtl819x_HTProc.c remaining as ht_update_default_setting
rtl8192u/ieee80211/rtl819x_HTProc.c changed to __ht_update_default_setting
Referenced in files:
staging/rtl8192e/rtllib_module.c remaining as ht_update_default_setting
staging/rtl8192u/ieee80211_module.c changed to __ht_update_default_setting
Linux Kernel Coding Style "cleanup", no change in runtime,
staging/rtl8192e and rtl8192u compile/build before and after.
Signed-off-by: Gary Rookard <garyrookard@fastmail.org>
---
drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +-
drivers/staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +-
drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
index 4e598c7f0d31..ae2fb249eaa1 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
@@ -2293,7 +2293,7 @@ void HTDebugHTInfo(u8 *InfoIE, u8 *TitleString);
void HTSetConnectBwMode(struct ieee80211_device *ieee,
enum ht_channel_width Bandwidth, enum ht_extension_chan_offset Offset);
-void ht_update_default_setting(struct ieee80211_device *ieee);
+void __ht_update_default_setting(struct ieee80211_device *ieee);
void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap,
u8 *len, u8 isEncrypt);
void HTConstructInfoElement(struct ieee80211_device *ieee, u8 *posHTInfo,
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
index 6f6813899e31..f35765167e1b 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
@@ -146,7 +146,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
ieee80211_networks_free(ieee);
goto failed;
}
- ht_update_default_setting(ieee);
+ __ht_update_default_setting(ieee);
HTInitializeHTInfo(ieee); /* may move to other place. */
TSInitialize(ieee);
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
index cf9400859700..d5354147e7ae 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
@@ -56,7 +56,7 @@ static u8 CISCO_BROADCOM[3] = {0x00, 0x17, 0x94};
* return: none
* notice: These value need be modified if any changes.
*/
-void ht_update_default_setting(struct ieee80211_device *ieee)
+void __ht_update_default_setting(struct ieee80211_device *ieee)
{
PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
//const typeof( ((struct ieee80211_device *)0)->pHTInfo ) *__mptr = &pHTInfo;
--
2.41.0
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] staging: rtl8192u: ieee80211: renamed duplicate variable
2023-09-28 3:32 [PATCH v2] staging: rtl8192u: ieee80211: renamed duplicate variable Gary Rookard
@ 2023-09-28 4:57 ` Philipp Hortmann
2023-09-28 4:58 ` Dan Carpenter
1 sibling, 0 replies; 3+ messages in thread
From: Philipp Hortmann @ 2023-09-28 4:57 UTC (permalink / raw)
To: Gary Rookard, gregkh; +Cc: linux-staging, linux-kernel
On 9/28/23 05:32, Gary Rookard wrote:
> This patch renames a duplicate variable found in both rtl8192e and
> rtl8192u causing the preprocesser/compiler to compile without error
> when in fact it should throw an error/break the build.
>
> Prototype in files:
> rtl8192e/rtllib.h remaining as ht_update_default_setting
> rtl8192u/ieee80211/ieee80211.h changed to __ht_update_default_setting
>
> Function in files:
> rtl8192e/rtl819x_HTProc.c remaining as ht_update_default_setting
> rtl8192u/ieee80211/rtl819x_HTProc.c changed to __ht_update_default_setting
>
> Referenced in files:
> staging/rtl8192e/rtllib_module.c remaining as ht_update_default_setting
> staging/rtl8192u/ieee80211_module.c changed to __ht_update_default_setting
>
> Linux Kernel Coding Style "cleanup", no change in runtime,
> staging/rtl8192e and rtl8192u compile/build before and after.
>
> Signed-off-by: Gary Rookard <garyrookard@fastmail.org>
> ---
Hi Gary,
this patch cannot be applied. I cannot find the variable
ht_update_default_setting in this driver.
Bye Philipp
> drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +-
> drivers/staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +-
> drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
> index 4e598c7f0d31..ae2fb249eaa1 100644
> --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
> +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
> @@ -2293,7 +2293,7 @@ void HTDebugHTInfo(u8 *InfoIE, u8 *TitleString);
>
> void HTSetConnectBwMode(struct ieee80211_device *ieee,
> enum ht_channel_width Bandwidth, enum ht_extension_chan_offset Offset);
> -void ht_update_default_setting(struct ieee80211_device *ieee);
> +void __ht_update_default_setting(struct ieee80211_device *ieee);
> void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap,
> u8 *len, u8 isEncrypt);
> void HTConstructInfoElement(struct ieee80211_device *ieee, u8 *posHTInfo,
> diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
> index 6f6813899e31..f35765167e1b 100644
> --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
> +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
> @@ -146,7 +146,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
> ieee80211_networks_free(ieee);
> goto failed;
> }
> - ht_update_default_setting(ieee);
> + __ht_update_default_setting(ieee);
> HTInitializeHTInfo(ieee); /* may move to other place. */
> TSInitialize(ieee);
>
> diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
> index cf9400859700..d5354147e7ae 100644
> --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
> +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
> @@ -56,7 +56,7 @@ static u8 CISCO_BROADCOM[3] = {0x00, 0x17, 0x94};
> * return: none
> * notice: These value need be modified if any changes.
> */
> -void ht_update_default_setting(struct ieee80211_device *ieee)
> +void __ht_update_default_setting(struct ieee80211_device *ieee)
> {
> PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
> //const typeof( ((struct ieee80211_device *)0)->pHTInfo ) *__mptr = &pHTInfo;
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] staging: rtl8192u: ieee80211: renamed duplicate variable
2023-09-28 3:32 [PATCH v2] staging: rtl8192u: ieee80211: renamed duplicate variable Gary Rookard
2023-09-28 4:57 ` Philipp Hortmann
@ 2023-09-28 4:58 ` Dan Carpenter
1 sibling, 0 replies; 3+ messages in thread
From: Dan Carpenter @ 2023-09-28 4:58 UTC (permalink / raw)
To: Gary Rookard; +Cc: gregkh, linux-staging, linux-kernel
On Wed, Sep 27, 2023 at 11:32:20PM -0400, Gary Rookard wrote:
> This patch renames a duplicate variable found in both rtl8192e and
> rtl8192u causing the preprocesser/compiler to compile without error
> when in fact it should throw an error/break the build.
>
> Prototype in files:
> rtl8192e/rtllib.h remaining as ht_update_default_setting
> rtl8192u/ieee80211/ieee80211.h changed to __ht_update_default_setting
>
> Function in files:
> rtl8192e/rtl819x_HTProc.c remaining as ht_update_default_setting
> rtl8192u/ieee80211/rtl819x_HTProc.c changed to __ht_update_default_setting
>
> Referenced in files:
> staging/rtl8192e/rtllib_module.c remaining as ht_update_default_setting
> staging/rtl8192u/ieee80211_module.c changed to __ht_update_default_setting
>
> Linux Kernel Coding Style "cleanup", no change in runtime,
> staging/rtl8192e and rtl8192u compile/build before and after.
>
> Signed-off-by: Gary Rookard <garyrookard@fastmail.org>
> ---
This doesn't apply, and there is no Fixes tag to suggest when these bugs
were introduced.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-28 4:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-28 3:32 [PATCH v2] staging: rtl8192u: ieee80211: renamed duplicate variable Gary Rookard
2023-09-28 4:57 ` Philipp Hortmann
2023-09-28 4:58 ` Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®