From 892310b93e9ab62538bd9155bbbd5c9437e0a18d Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 20 Mar 2009 23:53:05 -0400 Subject: [PATCH] --- yaml --- r: 136174 b: refs/heads/master c: cc0b6fe88e99096868bdbacbf486c97299533b5a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bc5a75dc9944..387622344d40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e097dc65673ed421bbc2e49f52c125aa43a8ee6 +refs/heads/master: cc0b6fe88e99096868bdbacbf486c97299533b5a diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index ead9dccb5475..9afc9168748b 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -1601,6 +1601,10 @@ static bool reg_same_country_ie_hint(struct wiphy *wiphy, assert_cfg80211_lock(); + if (unlikely(last_request->initiator != + NL80211_REGDOM_SET_BY_COUNTRY_IE)) + return false; + request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx); if (!request_wiphy) @@ -1663,7 +1667,9 @@ void regulatory_hint_11d(struct wiphy *wiphy, * we optimize an early check to exit out early if we don't have to * do anything */ - if (likely(wiphy_idx_valid(last_request->wiphy_idx))) { + if (likely(last_request->initiator == + NL80211_REGDOM_SET_BY_COUNTRY_IE && + wiphy_idx_valid(last_request->wiphy_idx))) { struct cfg80211_registered_device *drv_last_ie; drv_last_ie =