From: Seth Forshee <seth.forshee@canonical.com>
To: Arend van Spriel <arend@broadcom.com>
Cc: "John W. Linville" <linville@tuxdriver.com>,
Linux Wireless List <linux-wireless@vger.kernel.org>
Subject: Re: [PATCH 7/9] brcm80211: smac: do not use US as fallback regulatory hint
Date: Fri, 13 Apr 2012 09:48:23 -0500 [thread overview]
Message-ID: <20120413144823.GC3336@thinkpad-t410> (raw)
In-Reply-To: <1334137971-3972-8-git-send-email-arend@broadcom.com>
On Wed, Apr 11, 2012 at 11:52:49AM +0200, Arend van Spriel wrote:
> The brcmsmac driver provides the country code from sprom as a regulatory
> hint to cfg80211. When brcmsmac does not find a country code entry in
> the sprom it passes 'US' as regulatory hint. Better approach is to rely
> on the world regulatory domain in cfg80211/crda.
>
> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
> Reviewed-by: Brett Rudley <brudley@broadcom.com>
> Signed-off-by: Arend van Spriel <arend@broadcom.com>
> ---
> .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 6 +-----
> 1 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
> index 569ab8a..aa15558 100644
> --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
> +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
> @@ -1069,11 +1069,7 @@ static struct brcms_info *brcms_attach(struct bcma_device *pdev)
> wiphy_err(wl->wiphy, "%s: ieee80211_register_hw failed, status"
> "%d\n", __func__, err);
>
> - if (wl->pub->srom_ccode[0])
> - err = brcms_set_hint(wl, wl->pub->srom_ccode);
> - else
> - err = brcms_set_hint(wl, "US");
> - if (err)
> + if (wl->pub->srom_ccode[0] && brcms_set_hint(wl, wl->pub->srom_ccode))
> wiphy_err(wl->wiphy, "%s: regulatory_hint failed, status %d\n",
> __func__, err);
err no longer holds the return value from brcms_set_hint(), so it
doesn't make sense to print it in the error message. The value will
always be 0.
Seth
next prev parent reply other threads:[~2012-04-13 14:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-11 9:52 [PATCH 0/9] brcm80211: minor bug fixes for broadcom driver Arend van Spriel
2012-04-11 9:52 ` [PATCH 1/9] brcm80211: fmac: make brcmf_net_attach() static Arend van Spriel
2012-04-11 9:52 ` [PATCH 2/9] brcm80211: fmac: remove primary mac address handling from brcmf_net_attach Arend van Spriel
2012-04-11 9:52 ` [PATCH 3/9] brcm80211: fmac: register primary net device with device mac address Arend van Spriel
2012-04-11 9:52 ` [PATCH 4/9] brcm80211: fmac: add frame header extension support Arend van Spriel
2012-04-11 9:52 ` [PATCH 5/9] brcm80211: fmac: postpone dongle RF enabling Arend van Spriel
2012-04-11 9:52 ` [PATCH 6/9] brcm80211: fmac: clean up chip id table Arend van Spriel
2012-04-11 9:52 ` [PATCH 7/9] brcm80211: smac: do not use US as fallback regulatory hint Arend van Spriel
2012-04-13 14:48 ` Seth Forshee [this message]
2012-04-16 8:20 ` Arend van Spriel
2012-04-11 9:52 ` [PATCH 8/9] brcm80211: smac: only provide valid " Arend van Spriel
2012-04-11 9:52 ` [PATCH 9/9] brcm80211: smac: resume transmit fifo upon receiving frames Arend van Spriel
2012-04-13 17:57 ` [PATCH 0/9] brcm80211: minor bug fixes for broadcom driver John W. Linville
2012-04-16 8:51 ` Arend van Spriel
2012-04-16 17:18 ` John W. Linville
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=20120413144823.GC3336@thinkpad-t410 \
--to=seth.forshee@canonical.com \
--cc=arend@broadcom.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).