On Thu, Jul 15, 2010 at 12:06 PM, John W. Linville <linville@xxxxxxxxxxxxx> wrote: > The meaning and/or usage of the country IE is somewhat poorly defined. > In practice, this means that regulatory rulesets in a country IE are > often incomplete and might be untrustworthy. This removes the code > associated with interpreting those rulesets while preserving respect > for country "alpha2" codes also contained in the country IE. > > Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx> > @@ -2026,13 +1501,17 @@ static bool reg_same_country_ie_hint(struct wiphy *wiphy, > return false; > > if (likely(request_wiphy != wiphy)) > - return !country_ie_integrity_changes(country_ie_checksum); > + return (last_request->alpha2[0] == alpha2[0] && > + last_request->alpha2[1] == alpha2[1] && > + last_request->country_ie_env == env); > /* > * We should not have let these through at this point, they > * should have been picked up earlier by the first alpha2 check > * on the device > */ > - if (WARN_ON(!country_ie_integrity_changes(country_ie_checksum))) > + if (WARN_ON((last_request->alpha2[0] == alpha2[0] && > + last_request->alpha2[1] == alpha2[1] && > + last_request->country_ie_env == env ))) > return true; > return false; > } Might as well remove reg_same_country_ie_hint() completely since we already dealt with suspend/resume through the regulatory hint disconnect. But this can technically be done through a secondary patch to clarify this particular removal. Other than that this looks good. Luis -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
