2017-05-18 10:32:15

by Wright Feng

[permalink] [raw]
Subject: [PATCH] brcmfmac: remove setting IBSS mode when stopping AP

From: Chi-hsien Lin <[email protected]>

Setting IBSS mode when stopping AP may affect functionality of INFRA
mode on another interface. For instance, if user creates and stops
hostap daemon on virtual interface, then association cannot work on
primary interface because default BSS has been set to IBSS mode in
firmware side. The IBSS mode should be set when cfg80211 changes the
interface.

Reviewed-by: Wright Feng <[email protected]>
Signed-off-by: Chi-hsien Lin <[email protected]>
Signed-off-by: Wright Feng <[email protected]>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 944b83c..ce2a5b6 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -4658,9 +4658,6 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_AP, 0);
if (err < 0)
brcmf_err("setting AP mode failed %d\n", err);
- err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_INFRA, 0);
- if (err < 0)
- brcmf_err("setting INFRA mode failed %d\n", err);
if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS))
brcmf_fil_iovar_int_set(ifp, "mbss", 0);
brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY,
--
2.1.0


2017-05-19 04:50:04

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH] brcmfmac: remove setting IBSS mode when stopping AP

Wright Feng <[email protected]> writes:

> From: Chi-hsien Lin <[email protected]>
>
> Setting IBSS mode when stopping AP may affect functionality of INFRA
> mode on another interface. For instance, if user creates and stops
> hostap daemon on virtual interface, then association cannot work on
> primary interface because default BSS has been set to IBSS mode in
> firmware side. The IBSS mode should be set when cfg80211 changes the
> interface.
>
> Reviewed-by: Wright Feng <[email protected]>
> Signed-off-by: Chi-hsien Lin <[email protected]>
> Signed-off-by: Wright Feng <[email protected]>
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> index 944b83c..ce2a5b6 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> @@ -4658,9 +4658,6 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
> err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_AP, 0);
> if (err < 0)
> brcmf_err("setting AP mode failed %d\n", err);
> - err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_INFRA, 0);
> - if (err < 0)
> - brcmf_err("setting INFRA mode failed %d\n", err);

The title talks about setting IBSS mode but the code looks to be about
setting INFRA mode. Is this correct?

--
Kalle Valo

2017-05-19 07:50:11

by Arend van Spriel

[permalink] [raw]
Subject: Re: [PATCH] brcmfmac: remove setting IBSS mode when stopping AP

On 5/19/2017 6:49 AM, Kalle Valo wrote:
> Wright Feng <[email protected]> writes:
>
>> From: Chi-hsien Lin <[email protected]>
>>
>> Setting IBSS mode when stopping AP may affect functionality of INFRA
>> mode on another interface. For instance, if user creates and stops
>> hostap daemon on virtual interface, then association cannot work on
>> primary interface because default BSS has been set to IBSS mode in
>> firmware side. The IBSS mode should be set when cfg80211 changes the
>> interface.
>>
>> Reviewed-by: Wright Feng <[email protected]>
>> Signed-off-by: Chi-hsien Lin <[email protected]>
>> Signed-off-by: Wright Feng <[email protected]>
>> ---
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 ---
>> 1 file changed, 3 deletions(-)
>>
>> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
>> index 944b83c..ce2a5b6 100644
>> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
>> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
>> @@ -4658,9 +4658,6 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
>> err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_AP, 0);
>> if (err < 0)
>> brcmf_err("setting AP mode failed %d\n", err);
>> - err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_INFRA, 0);
>> - if (err < 0)
>> - brcmf_err("setting INFRA mode failed %d\n", err);
>
> The title talks about setting IBSS mode but the code looks to be about
> setting INFRA mode. Is this correct?

Both are correct :-p Have to admit this is confusing. The command
SET_INFRA with zero value means "disable INFRA; thus enable IBSS".

I would rephrase the commit message indeed explaining what the code
currently does, ie.:

Upon stopping an AP interface the driver disable INFRA mode effectively
setting the interface in IBSS mode. However, this may affect other
interfaces running in INFRA mode. For instance, ....

Regards,
Arend

2017-05-22 15:21:57

by Kalle Valo

[permalink] [raw]
Subject: Re: brcmfmac: remove setting IBSS mode when stopping AP

Wright Feng <[email protected]> wrote:
> From: Chi-hsien Lin <[email protected]>
>
> Upon stopping an AP interface the driver disable INFRA mode effectively
> setting the interface in IBSS mode. However, this may affect other
> interfaces running in INFRA mode. For instance, if user creates and stops
> hostap daemon on virtual interface, then association cannot work on
> primary interface because default BSS has been set to IBSS mode in
> firmware side. The IBSS mode should be set when cfg80211 changes the
> interface.
>
> Reviewed-by: Wright Feng <[email protected]>
> Signed-off-by: Chi-hsien Lin <[email protected]>
> [[email protected]: rephased commit log based on discussion]
> Signed-off-by: Wright Feng <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

9029679f66d9 brcmfmac: remove setting IBSS mode when stopping AP

--
https://patchwork.kernel.org/patch/9733205/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2017-05-19 07:54:56

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH] brcmfmac: remove setting IBSS mode when stopping AP

Arend van Spriel <[email protected]> writes:

> On 5/19/2017 6:49 AM, Kalle Valo wrote:
>> Wright Feng <[email protected]> writes:
>>
>>> From: Chi-hsien Lin <[email protected]>
>>>
>>> Setting IBSS mode when stopping AP may affect functionality of INFRA
>>> mode on another interface. For instance, if user creates and stops
>>> hostap daemon on virtual interface, then association cannot work on
>>> primary interface because default BSS has been set to IBSS mode in
>>> firmware side. The IBSS mode should be set when cfg80211 changes the
>>> interface.
>>>
>>> Reviewed-by: Wright Feng <[email protected]>
>>> Signed-off-by: Chi-hsien Lin <[email protected]>
>>> Signed-off-by: Wright Feng <[email protected]>
>>> ---
>>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 ---
>>> 1 file changed, 3 deletions(-)
>>>
>>> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
>>> index 944b83c..ce2a5b6 100644
>>> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
>>> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
>>> @@ -4658,9 +4658,6 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
>>> err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_AP, 0);
>>> if (err < 0)
>>> brcmf_err("setting AP mode failed %d\n", err);
>>> - err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_INFRA, 0);
>>> - if (err < 0)
>>> - brcmf_err("setting INFRA mode failed %d\n", err);
>>
>> The title talks about setting IBSS mode but the code looks to be about
>> setting INFRA mode. Is this correct?
>
> Both are correct :-p Have to admit this is confusing. The command
> SET_INFRA with zero value means "disable INFRA; thus enable IBSS".

Ah, that IS confusing :)

> I would rephrase the commit message indeed explaining what the code
> currently does, ie.:
>
> Upon stopping an AP interface the driver disable INFRA mode
> effectively setting the interface in IBSS mode. However, this may
> affect other interfaces running in INFRA mode. For instance, ....

I can fix that during commit. Thanks.

--
Kalle Valo