From: Arend van Spriel <arend.vanspriel-dY08KVG/lbpWk0Htik3J/w@public•gmane.org>
To: "Rafał Miłecki" <zajec5-Re5JQEeQqe8AvxtiuMwx3w@public•gmane.org>,
"Kalle Valo" <kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public•gmane.org>
Cc: Brett Rudley <brudley-dY08KVG/lbpWk0Htik3J/w@public•gmane.org>,
Arend van Spriel <arend-dY08KVG/lbpWk0Htik3J/w@public•gmane.org>,
"Franky (Zhenhui) Lin"
<frankyl-dY08KVG/lbpWk0Htik3J/w@public•gmane.org>,
Hante Meuleman <meuleman-dY08KVG/lbpWk0Htik3J/w@public•gmane.org>,
Pieter-Paul Giesberts
<pieterpg-dY08KVG/lbpWk0Htik3J/w@public•gmane.org>,
Franky Lin <franky.lin-dY08KVG/lbpWk0Htik3J/w@public•gmane.org>,
"open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER"
<linux-wireless-u79uwXL29TY76Z2rM5mHXA@public•gmane.org>,
"open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER"
<brcm80211-dev-list-dY08KVG/lbpWk0Htik3J/w@public•gmane.org>,
"open list:NETWORKING DRIVERS"
<netdev-u79uwXL29TY76Z2rM5mHXA@public•gmane.org>,
open list <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public•gmane.org>
Subject: Re: [PATCH] brcmfmac: rework function picking free BSS index
Date: Thu, 9 Jun 2016 21:16:47 +0200 [thread overview]
Message-ID: <5759C09F.7020704@broadcom.com> (raw)
In-Reply-To: <1464219876-13776-1-git-send-email-zajec5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
On 26-05-16 01:44, Rafał Miłecki wrote:
> The old implementation was overcomplicated and slightly bugged in some
> corner cases.
>
> Consider following state of BSS-es (limited to 6 for simplification):
> drvr->iflist[0]: { bsscfgidx:0, ndev->name:wlan1, }
> drvr->iflist[1]: (null)
> drvr->iflist[2]: { bsscfgidx:2, ndev->name:wlan1-1, }
> drvr->iflist[3]: { bsscfgidx:3, ndev->name:wlan1-2, }
> drvr->iflist[4]: (null)
> drvr->iflist[5]: (null)
> In such case the next AP interface should bsscfgidx 4 (we don't use 1 as
> it's reserved for P2P).
>
> With old code the loop iterations were following:
> [ifidx = 0] [bsscfgidx = 2] [highest = 2]
> [ifidx = 1] [bsscfgidx = 2] [highest = 2] available = true
> [ifidx = 2] [bsscfgidx = 2] [highest = 2] bsscfgidx = highest + 1
> [ifidx = 3] [bsscfgidx = 3] [highest = 2] bsscfgidx = highest + 1
> [ifidx = 4] [bsscfgidx = 3] [highest = 2] available = true
> [ifidx = 5] [bsscfgidx = 3] [highest = 2] available = true
> There were 2 obvious problems:
> 1) Having empty BSS at index 1 was resulting in available being always
> set to true, even if we would run out of BSS-es.
> 2) Calculated bsscfgidx was invalid (3 instead of 4) resulting in driver
> not being able to create the 4th AP interface.
>
> New code is simpler, placed in file where it's really used, handles
> running out of free BSS-es and allows using 4 interfaces at the same
> time. It also looks for the first free BSS instead of one after the last
> in use. It works well with current driver (which doesn't allow deleting
> interfaces) and should be future proof (if we ever allow deleting).
>
> Signed-off-by: Rafał Miłecki <zajec5-Re5JQEeQqe8AvxtiuMwx3w@public•gmane.org>
> ---
> .../broadcom/brcm80211/brcmfmac/cfg80211.c | 17 ++++++++++++++-
> .../wireless/broadcom/brcm80211/brcmfmac/core.c | 24 ----------------------
> .../wireless/broadcom/brcm80211/brcmfmac/core.h | 1 -
> 3 files changed, 16 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> index 3d09d23..d00eef8 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> @@ -541,6 +541,21 @@ brcmf_cfg80211_update_proto_addr_mode(struct wireless_dev *wdev)
> ADDR_INDIRECT);
> }
>
> +static int brcmf_get_first_free_bsscfgidx(struct brcmf_pub *drvr)
> +{
> + int bsscfgidx;
> +
> + for (bsscfgidx = 0; bsscfgidx < BRCMF_MAX_IFS; bsscfgidx++) {
> + /* bsscfgidx 1 is reserved for legacy P2P */
Hi Rafał,
A bit late as the patch is already applied, but this reserved index is
no longer needed as we removed all trickery that was build on the
assumption that the P2P_DEVICE interface was always in bsscfgidx 1.
Hence this could be removed.
Regards,
Arend
> + if (bsscfgidx == 1)
> + continue;
> + if (!drvr->iflist[bsscfgidx])
> + return bsscfgidx;
> + }
> +
> + return -ENOMEM;
> +}
> +
> static int brcmf_cfg80211_request_ap_if(struct brcmf_if *ifp)
> {
> struct brcmf_mbss_ssid_le mbss_ssid_le;
> @@ -548,7 +563,7 @@ static int brcmf_cfg80211_request_ap_if(struct brcmf_if *ifp)
> int err;
>
> memset(&mbss_ssid_le, 0, sizeof(mbss_ssid_le));
> - bsscfgidx = brcmf_get_next_free_bsscfgidx(ifp->drvr);
> + bsscfgidx = brcmf_get_first_free_bsscfgidx(ifp->drvr);
> if (bsscfgidx < 0)
> return bsscfgidx;
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
> index b590499..6a76480 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
> @@ -753,30 +753,6 @@ void brcmf_remove_interface(struct brcmf_if *ifp)
> brcmf_del_if(ifp->drvr, ifp->bsscfgidx);
> }
>
> -int brcmf_get_next_free_bsscfgidx(struct brcmf_pub *drvr)
> -{
> - int ifidx;
> - int bsscfgidx;
> - bool available;
> - int highest;
> -
> - available = false;
> - bsscfgidx = 2;
> - highest = 2;
> - for (ifidx = 0; ifidx < BRCMF_MAX_IFS; ifidx++) {
> - if (drvr->iflist[ifidx]) {
> - if (drvr->iflist[ifidx]->bsscfgidx == bsscfgidx)
> - bsscfgidx = highest + 1;
> - else if (drvr->iflist[ifidx]->bsscfgidx > highest)
> - highest = drvr->iflist[ifidx]->bsscfgidx;
> - } else {
> - available = true;
> - }
> - }
> -
> - return available ? bsscfgidx : -ENOMEM;
> -}
> -
> #ifdef CONFIG_INET
> #define ARPOL_MAX_ENTRIES 8
> static int brcmf_inetaddr_changed(struct notifier_block *nb,
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
> index 647d3cc..2a075c5 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
> @@ -217,7 +217,6 @@ int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked);
> struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
> bool is_p2pdev, char *name, u8 *mac_addr);
> void brcmf_remove_interface(struct brcmf_if *ifp);
> -int brcmf_get_next_free_bsscfgidx(struct brcmf_pub *drvr);
> void brcmf_txflowblock_if(struct brcmf_if *ifp,
> enum brcmf_netif_stop_reason reason, bool state);
> void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public•gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-06-09 19:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-25 23:44 [PATCH] brcmfmac: rework function picking free BSS index Rafał Miłecki
2016-06-09 16:17 ` Kalle Valo
[not found] ` <20160609161732.90E20613F6-4h6buKAYkuurB/BPivuO70B+6BGkLq7r@public.gmane.org>
2016-06-09 16:30 ` Kalle Valo
[not found] ` <87eg86l3zo.fsf-5ukZ45wKbUHoml4zekdYB16hYfS7NtTn@public.gmane.org>
2016-06-09 16:48 ` Rafał Miłecki
[not found] ` <1464219876-13776-1-git-send-email-zajec5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-06-09 19:16 ` Arend van Spriel [this message]
[not found] ` <5759C09F.7020704-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>
2016-06-13 19:30 ` [PATCH] " Arend van Spriel
2016-06-13 20:25 ` Rafał Miłecki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5759C09F.7020704@broadcom.com \
--to=arend.vanspriel-dy08kvg/lbpwk0htik3j/w@public$(echo .)gmane.org \
--cc=arend-dY08KVG/lbpWk0Htik3J/w@public$(echo .)gmane.org \
--cc=brcm80211-dev-list-dY08KVG/lbpWk0Htik3J/w@public$(echo .)gmane.org \
--cc=brudley-dY08KVG/lbpWk0Htik3J/w@public$(echo .)gmane.org \
--cc=franky.lin-dY08KVG/lbpWk0Htik3J/w@public$(echo .)gmane.org \
--cc=frankyl-dY08KVG/lbpWk0Htik3J/w@public$(echo .)gmane.org \
--cc=kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public$(echo .)gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=linux-wireless-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=meuleman-dY08KVG/lbpWk0Htik3J/w@public$(echo .)gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=pieterpg-dY08KVG/lbpWk0Htik3J/w@public$(echo .)gmane.org \
--cc=zajec5-Re5JQEeQqe8AvxtiuMwx3w@public$(echo .)gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox