[PATCH v4] 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 --- drivers/net/wireless/realtek/rtlwifi/base.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c index f45d093..52f2d0b 100644 --- a/drivers/net/wireless/realtek/rtlwifi/base.c +++ b/drivers/net/wireless/realtek/rtlwifi/base.c @@ -422,7 +422,6 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw) hw->extra_tx_headroom = RTL_TX_HEADER_SIZE; /* TODO: Correct this value for our hw */ - /* defined these hard code values */ hw->max_listen_interval = MAX_LISTEN_INTERVAL; hw->max_rate_tries = MAX_RATE_TRIES; /* hw->max_rates = 1; */ -- 1.9.1
[PATCH v4] 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 and removed the comment.
Signed-off-by: Souptick Joarder
---
drivers/net/wireless/realtek/rtlwifi/base.c | 5 ++---
drivers/net/wireless/realtek/rtlwifi/base.h | 2 ++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c
b/drivers/net/wireless/realtek/rtlwifi/base.c
index 8b833e2..ea18aa7 100644
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -426,9 +426,8 @@ 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;
+ 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 ab7d819..c591d75 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
Re: [PATCH v4] rtlwifi: Replace hardcode value with macro
On 07/31/2017 06:14 AM, Souptick Joarder wrote: In _rtl_init_mac80211(), hardcoded value for hw->max_listen_interval and hw->max_rate_tries are replaced by macro. That is NOT what your patch does. It only removes a comment! Granted, that comment is useless and should come out, but your commit message must be a little more accurate. NACK. Larry Signed-off-by: Souptick Joarder --- drivers/net/wireless/realtek/rtlwifi/base.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c index f45d093..52f2d0b 100644 --- a/drivers/net/wireless/realtek/rtlwifi/base.c +++ b/drivers/net/wireless/realtek/rtlwifi/base.c @@ -422,7 +422,6 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw) hw->extra_tx_headroom = RTL_TX_HEADER_SIZE; /* TODO: Correct this value for our hw */ - /* defined these hard code values */ hw->max_listen_interval = MAX_LISTEN_INTERVAL; hw->max_rate_tries = MAX_RATE_TRIES; /* hw->max_rates = 1; */ -- 1.9.1
Re: [PATCH v4] rtlwifi: Replace hardcode value with macro
Larry Finger writes: > On 07/31/2017 06:14 AM, Souptick Joarder wrote: >> In _rtl_init_mac80211(), hardcoded value for hw->max_listen_interval >> and hw->max_rate_tries are replaced by macro. > > That is NOT what your patch does. It only removes a comment! Granted, > that comment is useless and should come out, but your commit message > must be a little more accurate. Actually the patch does not even apply, I suspect that Souptick incorrectly used v3 of his patch as the baseline for v4. Instead this v4 should be folded with v3. -- Kalle Valo
Re: [PATCH v4] rtlwifi: Replace hardcode value with macro
Hi Kalle, On Wed, Aug 2, 2017 at 2:51 PM, Kalle Valo wrote: > Larry Finger writes: > >> On 07/31/2017 06:14 AM, Souptick Joarder wrote: >>> In _rtl_init_mac80211(), hardcoded value for hw->max_listen_interval >>> and hw->max_rate_tries are replaced by macro. >> >> That is NOT what your patch does. It only removes a comment! Granted, >> that comment is useless and should come out, but your commit message >> must be a little more accurate. > > Actually the patch does not even apply, I suspect that Souptick > incorrectly used v3 of his patch as the baseline for v4. Instead this v4 > should be folded with v3. Do you mean I should address your comment in v3 and send v3 again instead of v4 ? > > -- > Kalle Valo -Souptick
Re: [PATCH v4] rtlwifi: Replace hardcode value with macro
On 8/2/2017 12:47 PM, Souptick Joarder wrote: Hi Kalle, On Wed, Aug 2, 2017 at 2:51 PM, Kalle Valo wrote: Larry Finger writes: On 07/31/2017 06:14 AM, Souptick Joarder wrote: In _rtl_init_mac80211(), hardcoded value for hw->max_listen_interval and hw->max_rate_tries are replaced by macro. That is NOT what your patch does. It only removes a comment! Granted, that comment is useless and should come out, but your commit message must be a little more accurate. Actually the patch does not even apply, I suspect that Souptick incorrectly used v3 of his patch as the baseline for v4. Instead this v4 should be folded with v3. Do you mean I should address your comment in v3 and send v3 again instead of v4 ? Your v4 patch should apply on top of wireless-drivers-next/master as is. Regards, Arend
Re: [PATCH v4] rtlwifi: Replace hardcode value with macro
On 8/2/2017 1:59 PM, Souptick Joarder wrote:
In _rtl_init_mac80211(), hardcoded value for hw->max_listen_interval
and hw->max_rate_tries are replaced by macro and removed the comment.
Signed-off-by: Souptick Joarder
---
drivers/net/wireless/realtek/rtlwifi/base.c | 5 ++---
drivers/net/wireless/realtek/rtlwifi/base.h | 2 ++
2 files changed, 4 insertions(+), 3 deletions(-)
[...]
diff --git a/drivers/net/wireless/realtek/rtlwifi/base.h
b/drivers/net/wireless/realtek/rtlwifi/base.h
index ab7d819..c591d75 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
It is not so nice to mix tabs and spaces like that. Better adhere to the
existing convention.
Regards,
Arend
