diff mbox

[0/2] cfg80211: two reg fixes

Message ID 20140422204552.GR27882@wotan.suse.de (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Luis Chamberlain April 22, 2014, 8:45 p.m. UTC 
On Tue, Apr 22, 2014 at 06:00:03PM +0200, Michael Leun wrote:
> On Mon, 21 Apr 2014 20:39:33 -0700
> "Luis R. Rodriguez" <mcgrof@do-not-panic.com> wrote:
> 
> 
> 
> > that'd be appreciated as an alternative. I'm also very curious to hear
> > no one else would have run into the same regression as you have.
> 
> I only see this on an Acer PTZ1825 with an ath9k wireless card, but
> that machine was not sold with that wlan card, so other people with the
> same model won't neccesarily see the same issue.

OK I see the issue and its clear now how this could have
gone through, the wiphy comes from the country IE and it
could have gone disappearing during suspend / hotplug, so
we do need to check for it again.

--
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

Comments

Michael Leun April 22, 2014, 9:32 p.m. UTC | #1 
On Tue, 22 Apr 2014 22:45:52 +0200
"Luis R. Rodriguez" <mcgrof@suse.com> wrote:


> > I only see this on an Acer PTZ1825 with an ath9k wireless card, but
> > that machine was not sold with that wlan card, so other people with
> > the same model won't neccesarily see the same issue.
> 
> OK I see the issue and its clear now how this could have
> gone through, the wiphy comes from the country IE and it
> could have gone disappearing during suspend / hotplug, so
> we do need to check for it again.
[...]
> -		if (wiphy->regulatory_flags &
> REGULATORY_COUNTRY_IE_IGNORE)
> +		if (wiphy &&
> +		    wiphy->regulatory_flags &
> REGULATORY_COUNTRY_IE_IGNORE) return REG_REQ_IGNORE;

Yup, thats it. I can hear it whisper "put me into stable".

Thanks!
diff mbox

Patch

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index f054137..4f375b6 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1602,7 +1602,8 @@  __reg_process_hint_country_ie(struct wiphy *wiphy,
 			return REG_REQ_IGNORE;
 		return REG_REQ_ALREADY_SET;
 	} else {
-		if (wiphy->regulatory_flags & REGULATORY_COUNTRY_IE_IGNORE)
+		if (wiphy &&
+		    wiphy->regulatory_flags & REGULATORY_COUNTRY_IE_IGNORE)
 			return REG_REQ_IGNORE;
 	}