staging: rtl8192e: rtl819x_HTProc: make arrays const and one static

[PATCH][next] staging: rtl8192e: rtl819x_HTProc: make arrays const and one static

Posted by Colin Ian King 3 years, 5 months ago

Make two dead-only arrays const. Make array EWC11NHTCap static const
so it is not populated on the stack, makes the code smaller too.

Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
 drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 62aa8e893c34..84ec8df047d7 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -282,7 +282,7 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap,
 	memset(posHTCap, 0, *len);
 
 	if ((bAssoc) && (pHT->ePeerHTSpecVer == HT_SPEC_VER_EWC)) {
-		u8	EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33};
+		static const u8	EWC11NHTCap[] = { 0x00, 0x90, 0x4c, 0x33 };
 
 		memcpy(posHTCap, EWC11NHTCap, sizeof(EWC11NHTCap));
 		pCapELE = (struct ht_capab_ele *)&posHTCap[4];
@@ -515,8 +515,8 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
 	u16 nMaxAMSDUSize = 0;
 	u8 *pMcsFilter = NULL;
 
-	static u8 EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33};
-	static u8 EWC11NHTInfo[] = {0x00, 0x90, 0x4c, 0x34};
+	static const u8 EWC11NHTCap[] = { 0x00, 0x90, 0x4c, 0x33 };
+	static const u8 EWC11NHTInfo[] = { 0x00, 0x90, 0x4c, 0x34 };
 
 	if (!pHTInfo->bCurrentHTSupport) {
 		netdev_warn(ieee->dev, "%s(): HT_DISABLE\n", __func__);
-- 
2.38.1

Re: [PATCH][next] staging: rtl8192e: rtl819x_HTProc: make arrays const and one static

Posted by Philipp Hortmann 3 years, 5 months ago

On 11/3/22 14:06, Colin Ian King wrote:
> Make two dead-only arrays const. Make array EWC11NHTCap static const
> so it is not populated on the stack, makes the code smaller too.
> 
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> ---
>   drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
> index 62aa8e893c34..84ec8df047d7 100644
> --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
> +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
> @@ -282,7 +282,7 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap,
>   	memset(posHTCap, 0, *len);
>   
>   	if ((bAssoc) && (pHT->ePeerHTSpecVer == HT_SPEC_VER_EWC)) {
> -		u8	EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33};
> +		static const u8	EWC11NHTCap[] = { 0x00, 0x90, 0x4c, 0x33 };
>   
>   		memcpy(posHTCap, EWC11NHTCap, sizeof(EWC11NHTCap));
>   		pCapELE = (struct ht_capab_ele *)&posHTCap[4];
> @@ -515,8 +515,8 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
>   	u16 nMaxAMSDUSize = 0;
>   	u8 *pMcsFilter = NULL;
>   
> -	static u8 EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33};
> -	static u8 EWC11NHTInfo[] = {0x00, 0x90, 0x4c, 0x34};
> +	static const u8 EWC11NHTCap[] = { 0x00, 0x90, 0x4c, 0x33 };
> +	static const u8 EWC11NHTInfo[] = { 0x00, 0x90, 0x4c, 0x34 };
>   
>   	if (!pHTInfo->bCurrentHTSupport) {
>   		netdev_warn(ieee->dev, "%s(): HT_DISABLE\n", __func__);

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>