diff mbox

[01/13] brcmfmac: Simplify scan timing configuration.

Message ID 1449656572-16158-2-git-send-email-arend@broadcom.com (mailing list archive)
State Changes Requested
Delegated to: Kalle Valo
Headers show

Commit Message

Arend van Spriel Dec. 9, 2015, 10:22 a.m. UTC 
From: Hante Meuleman <meuleman@broadcom.com>

Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Change-Id: Ie179527eb29f2ed8b7869dac24591e2513775393
Reviewed-on: http://hnd-swgit.sj.broadcom.com:8080/5445
Reviewed-by: brcm80211 ci <brcm80211-ci@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
 .../broadcom/brcm80211/brcmfmac/cfg80211.c         | 31 +++++++++-------------
 .../broadcom/brcm80211/brcmfmac/cfg80211.h         |  4 ---
 2 files changed, 12 insertions(+), 23 deletions(-)

Comments

Kalle Valo Dec. 9, 2015, 1:06 p.m. UTC | #1 
Arend van Spriel <arend@broadcom.com> writes:

> From: Hante Meuleman <meuleman@broadcom.com>
>

Please, no empty commit logs. For a patch like this it takes like 30
seconds to write a short log describing why and how you are simplifying
the code. Next year I'm thinking of start rejecting patches without a
commit log.

This is a minor nitpick but it's not that common to the commit title
with a period.

> Reviewed-by: Arend Van Spriel <arend@broadcom.com>
> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
> Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
> Change-Id: Ie179527eb29f2ed8b7869dac24591e2513775393
> Reviewed-on: http://hnd-swgit.sj.broadcom.com:8080/5445
> Reviewed-by: brcm80211 ci <brcm80211-ci@broadcom.com>
> Signed-off-by: Arend van Spriel <arend@broadcom.com>

Forgot to clean the tags? :)
Arend Van Spriel Dec. 10, 2015, 10:24 a.m. UTC | #2 
On 09-12-15 14:06, Kalle Valo wrote:
> Arend van Spriel <arend@broadcom.com> writes:
> 
>> From: Hante Meuleman <meuleman@broadcom.com>
>>
> 
> Please, no empty commit logs. For a patch like this it takes like 30
> seconds to write a short log describing why and how you are simplifying
> the code. Next year I'm thinking of start rejecting patches without a
> commit log.

Time to consider new year resolutions, heh ;-) Anyway, it is noted and
will see if I can gatekeep this better.

> This is a minor nitpick but it's not that common to the commit title
> with a period.

Have to agree to the nitpicking part :-p Can keep it in mind though.

>> Reviewed-by: Arend Van Spriel <arend@broadcom.com>
>> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
>> Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
>> Change-Id: Ie179527eb29f2ed8b7869dac24591e2513775393
>> Reviewed-on: http://hnd-swgit.sj.broadcom.com:8080/5445
>> Reviewed-by: brcm80211 ci <brcm80211-ci@broadcom.com>
>> Signed-off-by: Arend van Spriel <arend@broadcom.com>
> 
> Forgot to clean the tags? :)

*sigh* Obviously. Should not try to multitask when preparing patch series.

Gr. AvS

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Arend Van Spriel Dec. 10, 2015, 10:38 a.m. UTC | #3 
On 10-12-15 11:24, Arend van Spriel wrote:
> On 09-12-15 14:06, Kalle Valo wrote:
>> Arend van Spriel <arend@broadcom.com> writes:
>>
>>> From: Hante Meuleman <meuleman@broadcom.com>
>>>
>>
>> Please, no empty commit logs. For a patch like this it takes like 30
>> seconds to write a short log describing why and how you are simplifying
>> the code. Next year I'm thinking of start rejecting patches without a
>> commit log.
> 
> Time to consider new year resolutions, heh ;-) Anyway, it is noted and
> will see if I can gatekeep this better.
> 
>> This is a minor nitpick but it's not that common to the commit title
>> with a period.
> 
> Have to agree to the nitpicking part :-p Can keep it in mind though.

Had to check ;-) In 4.4 merge window there 297 commits ending with
period. With 13220 commits in total that can not be called common indeed.

Gr. AvS
>>> Reviewed-by: Arend Van Spriel <arend@broadcom.com>
>>> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
>>> Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
>>> Change-Id: Ie179527eb29f2ed8b7869dac24591e2513775393
>>> Reviewed-on: http://hnd-swgit.sj.broadcom.com:8080/5445
>>> Reviewed-by: brcm80211 ci <brcm80211-ci@broadcom.com>
>>> Signed-off-by: Arend van Spriel <arend@broadcom.com>
>>
>> Forgot to clean the tags? :)
> 
> *sigh* Obviously. Should not try to multitask when preparing patch series.
> 
> Gr. AvS
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Arend van Spriel Dec. 10, 2015, 10:40 a.m. UTC | #4 
On 12/10/2015 11:24 AM, Arend van Spriel wrote:
> On 09-12-15 14:06, Kalle Valo wrote:
>> Arend van Spriel <arend@broadcom.com> writes:
>>
>>> From: Hante Meuleman <meuleman@broadcom.com>
>>>
>>
>> Please, no empty commit logs. For a patch like this it takes like 30
>> seconds to write a short log describing why and how you are simplifying
>> the code. Next year I'm thinking of start rejecting patches without a
>> commit log.
>
> Time to consider new year resolutions, heh ;-) Anyway, it is noted and
> will see if I can gatekeep this better.
>
>> This is a minor nitpick but it's not that common to the commit title
>> with a period.
>
> Have to agree to the nitpicking part :-p Can keep it in mind though.
>
>>> Reviewed-by: Arend Van Spriel <arend@broadcom.com>
>>> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
>>> Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
>>> Change-Id: Ie179527eb29f2ed8b7869dac24591e2513775393
>>> Reviewed-on: http://hnd-swgit.sj.broadcom.com:8080/5445
>>> Reviewed-by: brcm80211 ci <brcm80211-ci@broadcom.com>
>>> Signed-off-by: Arend van Spriel <arend@broadcom.com>
>>
>> Forgot to clean the tags? :)
>
> *sigh* Obviously. Should not try to multitask when preparing patch series.

Do you want me to resend after cleaning it up?

Gr. AvS

> Gr. AvS
>

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kalle Valo Dec. 10, 2015, 11:39 a.m. UTC | #5 
Arend van Spriel <arend@broadcom.com> writes:

> On 12/10/2015 11:24 AM, Arend van Spriel wrote:
>> On 09-12-15 14:06, Kalle Valo wrote:
>>> Arend van Spriel <arend@broadcom.com> writes:
>>>
>>>> Reviewed-by: Arend Van Spriel <arend@broadcom.com>
>>>> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
>>>> Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
>>>> Change-Id: Ie179527eb29f2ed8b7869dac24591e2513775393
>>>> Reviewed-on: http://hnd-swgit.sj.broadcom.com:8080/5445
>>>> Reviewed-by: brcm80211 ci <brcm80211-ci@broadcom.com>
>>>> Signed-off-by: Arend van Spriel <arend@broadcom.com>
>>>
>>> Forgot to clean the tags? :)
>>
>> *sigh* Obviously. Should not try to multitask when preparing patch series.
>
> Do you want me to resend after cleaning it up?

Yeah, that would be the best.
diff mbox

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 771c581..4aebb2a 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -91,6 +91,10 @@ 
 #define BRCMF_SCAN_JOIN_PASSIVE_DWELL_TIME_MS	400
 #define BRCMF_SCAN_JOIN_PROBE_INTERVAL_MS	20
 
+#define BRCMF_SCAN_CHANNEL_TIME		40
+#define BRCMF_SCAN_UNASSOC_TIME		40
+#define BRCMF_SCAN_PASSIVE_TIME		120
+
 #define BRCMF_ASSOC_PARAMS_FIXED_SIZE \
 	(sizeof(struct brcmf_assoc_params_le) - sizeof(u16))
 
@@ -5357,37 +5361,27 @@  roam_setup_done:
 }
 
 static s32
-brcmf_dongle_scantime(struct brcmf_if *ifp, s32 scan_assoc_time,
-		      s32 scan_unassoc_time, s32 scan_passive_time)
+brcmf_dongle_scantime(struct brcmf_if *ifp)
 {
 	s32 err = 0;
 
 	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_CHANNEL_TIME,
-				    scan_assoc_time);
+				    BRCMF_SCAN_CHANNEL_TIME);
 	if (err) {
-		if (err == -EOPNOTSUPP)
-			brcmf_dbg(INFO, "Scan assoc time is not supported\n");
-		else
-			brcmf_err("Scan assoc time error (%d)\n", err);
+		brcmf_err("Scan assoc time error (%d)\n", err);
 		goto dongle_scantime_out;
 	}
 	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_UNASSOC_TIME,
-				    scan_unassoc_time);
+				    BRCMF_SCAN_UNASSOC_TIME);
 	if (err) {
-		if (err == -EOPNOTSUPP)
-			brcmf_dbg(INFO, "Scan unassoc time is not supported\n");
-		else
-			brcmf_err("Scan unassoc time error (%d)\n", err);
+		brcmf_err("Scan unassoc time error (%d)\n", err);
 		goto dongle_scantime_out;
 	}
 
 	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_PASSIVE_TIME,
-				    scan_passive_time);
+				    BRCMF_SCAN_PASSIVE_TIME);
 	if (err) {
-		if (err == -EOPNOTSUPP)
-			brcmf_dbg(INFO, "Scan passive time is not supported\n");
-		else
-			brcmf_err("Scan passive time error (%d)\n", err);
+		brcmf_err("Scan passive time error (%d)\n", err);
 		goto dongle_scantime_out;
 	}
 
@@ -6089,8 +6083,7 @@  static s32 brcmf_config_dongle(struct brcmf_cfg80211_info *cfg)
 	/* make sure RF is ready for work */
 	brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 0);
 
-	brcmf_dongle_scantime(ifp, WL_SCAN_CHANNEL_TIME,
-			      WL_SCAN_UNASSOC_TIME, WL_SCAN_PASSIVE_TIME);
+	brcmf_dongle_scantime(ifp);
 
 	power_mode = cfg->pwr_save ? PM_FAST : PM_OFF;
 	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM, power_mode);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
index d492163..cf7a93d 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
@@ -29,10 +29,6 @@ 
 #define WL_ROAM_TRIGGER_LEVEL		-75
 #define WL_ROAM_DELTA			20
 
-#define WL_SCAN_CHANNEL_TIME		40
-#define WL_SCAN_UNASSOC_TIME		40
-#define WL_SCAN_PASSIVE_TIME		120
-
 #define WL_ESCAN_BUF_SIZE		(1024 * 64)
 #define WL_ESCAN_TIMER_INTERVAL_MS	10000 /* E-Scan timeout */