Message ID | 20140422204552.GR27882@wotan.suse.de (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
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 --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; }