2017-06-22 12:00:09

by Souptick Joarder

[permalink] [raw]
Subject: [PATCH v2] rtlwifi: Replace hardcode value with macro

In _rtl_init_mac80211(), hardcoded value for hw->max_listen_interval
and hw->max_rate_tries are replaced by macro.

Signed-off-by: Souptick Joarder <[email protected]>
---
Changes in v2:
- Signed-off was missing in previous one.

drivers/net/wireless/realtek/rtlwifi/base.c | 6 +++---
drivers/net/wireless/realtek/rtlwifi/base.h | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
index bdc3791..f45d093 100644
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -422,9 +422,9 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
hw->extra_tx_headroom = RTL_TX_HEADER_SIZE;

/* TODO: Correct this value for our hw */
- /* TODO: define these hard code value */
- hw->max_listen_interval = 10;
- hw->max_rate_tries = 4;
+ /* defined these hard code values */
+ hw->max_listen_interval = MAX_LISTEN_INTERVAL;
+ hw->max_rate_tries = MAX_RATE_TRIES;
/* hw->max_rates = 1; */
hw->sta_data_size = sizeof(struct rtl_sta_info);

diff --git a/drivers/net/wireless/realtek/rtlwifi/base.h b/drivers/net/wireless/realtek/rtlwifi/base.h
index 02ff0c5..d03e198 100644
--- a/drivers/net/wireless/realtek/rtlwifi/base.h
+++ b/drivers/net/wireless/realtek/rtlwifi/base.h
@@ -65,6 +65,8 @@ enum ap_peer {
#define FRAME_OFFSET_ADDRESS3 16
#define FRAME_OFFSET_SEQUENCE 22
#define FRAME_OFFSET_ADDRESS4 24
+#define MAX_LISTEN_INTERVAL 10
+#define MAX_RATE_TRIES 4

#define SET_80211_HDR_FRAME_CONTROL(_hdr, _val) \
WRITEEF2BYTE(_hdr, _val)
--
1.9.1


2017-06-22 13:35:52

by Larry Finger

[permalink] [raw]
Subject: Re: [PATCH v2] rtlwifi: Replace hardcode value with macro

On 06/22/2017 07:00 AM, Souptick Joarder wrote:
> In _rtl_init_mac80211(), hardcoded value for hw->max_listen_interval
> and hw->max_rate_tries are replaced by macro.
>
> Signed-off-by: Souptick Joarder <[email protected]>
> ---
> Changes in v2:
> - Signed-off was missing in previous one.

This patch includes a comment that is not needed, but it is OK.

Acked-by: Larry Finger <[email protected]>

Larry

>
> drivers/net/wireless/realtek/rtlwifi/base.c | 6 +++---
> drivers/net/wireless/realtek/rtlwifi/base.h | 2 ++
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
> index bdc3791..f45d093 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/base.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/base.c
> @@ -422,9 +422,9 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
> hw->extra_tx_headroom = RTL_TX_HEADER_SIZE;
>
> /* TODO: Correct this value for our hw */
> - /* TODO: define these hard code value */
> - hw->max_listen_interval = 10;
> - hw->max_rate_tries = 4;
> + /* defined these hard code values */
> + hw->max_listen_interval = MAX_LISTEN_INTERVAL;
> + hw->max_rate_tries = MAX_RATE_TRIES;
> /* hw->max_rates = 1; */
> hw->sta_data_size = sizeof(struct rtl_sta_info);
>
> diff --git a/drivers/net/wireless/realtek/rtlwifi/base.h b/drivers/net/wireless/realtek/rtlwifi/base.h
> index 02ff0c5..d03e198 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/base.h
> +++ b/drivers/net/wireless/realtek/rtlwifi/base.h
> @@ -65,6 +65,8 @@ enum ap_peer {
> #define FRAME_OFFSET_ADDRESS3 16
> #define FRAME_OFFSET_SEQUENCE 22
> #define FRAME_OFFSET_ADDRESS4 24
> +#define MAX_LISTEN_INTERVAL 10
> +#define MAX_RATE_TRIES 4
>
> #define SET_80211_HDR_FRAME_CONTROL(_hdr, _val) \
> WRITEEF2BYTE(_hdr, _val)
> --
> 1.9.1
>
>

2017-06-28 16:17:44

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH v2] rtlwifi: Replace hardcode value with macro

Souptick Joarder <[email protected]> writes:

> In _rtl_init_mac80211(), hardcoded value for hw->max_listen_interval
> and hw->max_rate_tries are replaced by macro.
>
> Signed-off-by: Souptick Joarder <[email protected]>
> ---
> Changes in v2:
> - Signed-off was missing in previous one.
>
> drivers/net/wireless/realtek/rtlwifi/base.c | 6 +++---
> drivers/net/wireless/realtek/rtlwifi/base.h | 2 ++
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
> index bdc3791..f45d093 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/base.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/base.c
> @@ -422,9 +422,9 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
> hw->extra_tx_headroom = RTL_TX_HEADER_SIZE;
>
> /* TODO: Correct this value for our hw */
> - /* TODO: define these hard code value */
> - hw->max_listen_interval = 10;
> - hw->max_rate_tries = 4;
> + /* defined these hard code values */
> + hw->max_listen_interval = MAX_LISTEN_INTERVAL;
> + hw->max_rate_tries = MAX_RATE_TRIES;

Like Larry said, the comment does not make any sense. Please remove it
and send v3.

--
Kalle Valo

2017-06-28 04:29:04

by Souptick Joarder

[permalink] [raw]
Subject: Re: [PATCH v2] rtlwifi: Replace hardcode value with macro

Hi Larry,

On Thu, Jun 22, 2017 at 7:05 PM, Larry Finger <[email protected]> wrote:
> On 06/22/2017 07:00 AM, Souptick Joarder wrote:
>>
>> In _rtl_init_mac80211(), hardcoded value for hw->max_listen_interval
>> and hw->max_rate_tries are replaced by macro.
>>
>> Signed-off-by: Souptick Joarder <[email protected]>
>> ---
>> Changes in v2:
>> - Signed-off was missing in previous one.
>
>
> This patch includes a comment that is not needed, but it is OK.
>
> Acked-by: Larry Finger <[email protected]>
>
> Larry

Any further review is required for this patch or it will be merged to
maintainer tree ?

>
>
>>
>> drivers/net/wireless/realtek/rtlwifi/base.c | 6 +++---
>> drivers/net/wireless/realtek/rtlwifi/base.h | 2 ++
>> 2 files changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c
>> b/drivers/net/wireless/realtek/rtlwifi/base.c
>> index bdc3791..f45d093 100644
>> --- a/drivers/net/wireless/realtek/rtlwifi/base.c
>> +++ b/drivers/net/wireless/realtek/rtlwifi/base.c
>> @@ -422,9 +422,9 @@ static void _rtl_init_mac80211(struct ieee80211_hw
>> *hw)
>> hw->extra_tx_headroom = RTL_TX_HEADER_SIZE;
>>
>> /* TODO: Correct this value for our hw */
>> - /* TODO: define these hard code value */
>> - hw->max_listen_interval = 10;
>> - hw->max_rate_tries = 4;
>> + /* defined these hard code values */
>> + hw->max_listen_interval = MAX_LISTEN_INTERVAL;
>> + hw->max_rate_tries = MAX_RATE_TRIES;
>> /* hw->max_rates = 1; */
>> hw->sta_data_size = sizeof(struct rtl_sta_info);
>>
>> diff --git a/drivers/net/wireless/realtek/rtlwifi/base.h
>> b/drivers/net/wireless/realtek/rtlwifi/base.h
>> index 02ff0c5..d03e198 100644
>> --- a/drivers/net/wireless/realtek/rtlwifi/base.h
>> +++ b/drivers/net/wireless/realtek/rtlwifi/base.h
>> @@ -65,6 +65,8 @@ enum ap_peer {
>> #define FRAME_OFFSET_ADDRESS3 16
>> #define FRAME_OFFSET_SEQUENCE 22
>> #define FRAME_OFFSET_ADDRESS4 24
>> +#define MAX_LISTEN_INTERVAL 10
>> +#define MAX_RATE_TRIES 4
>>
>> #define SET_80211_HDR_FRAME_CONTROL(_hdr, _val) \
>> WRITEEF2BYTE(_hdr, _val)
>> --
>> 1.9.1
>>
>>
>

-Souptick

2017-06-29 04:13:39

by Souptick Joarder

[permalink] [raw]
Subject: Re: [PATCH v2] rtlwifi: Replace hardcode value with macro

Hi Kalle,

On Wed, Jun 28, 2017 at 9:47 PM, Kalle Valo <[email protected]> wrote:
> Souptick Joarder <[email protected]> writes:
>
>> In _rtl_init_mac80211(), hardcoded value for hw->max_listen_interval
>> and hw->max_rate_tries are replaced by macro.
>>
>> Signed-off-by: Souptick Joarder <[email protected]>
>> ---
>> Changes in v2:
>> - Signed-off was missing in previous one.

As Signed-off was missing in first patch, so I send v2 with change
logs mentioned the same.
Just for clarification, shall I replace the comment mentioned in
change log with "no change"?

>>
>> drivers/net/wireless/realtek/rtlwifi/base.c | 6 +++---
>> drivers/net/wireless/realtek/rtlwifi/base.h | 2 ++
>> 2 files changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
>> index bdc3791..f45d093 100644
>> --- a/drivers/net/wireless/realtek/rtlwifi/base.c
>> +++ b/drivers/net/wireless/realtek/rtlwifi/base.c
>> @@ -422,9 +422,9 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
>> hw->extra_tx_headroom = RTL_TX_HEADER_SIZE;
>>
>> /* TODO: Correct this value for our hw */
>> - /* TODO: define these hard code value */
>> - hw->max_listen_interval = 10;
>> - hw->max_rate_tries = 4;
>> + /* defined these hard code values */
>> + hw->max_listen_interval = MAX_LISTEN_INTERVAL;
>> + hw->max_rate_tries = MAX_RATE_TRIES;
>
> Like Larry said, the comment does not make any sense. Please remove it
> and send v3.
>
> --
> Kalle Valo

Souptick