From 06f0803811bcaee54e5f8e2ef0a5fd3789bae6fe Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Wed, 15 Dec 2010 19:24:11 -0800 Subject: [PATCH] --- yaml --- r: 225334 b: refs/heads/master c: 2784fe915cd25adf23ea28534019308d8a144721 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/cfg80211.h | 4 +++- trunk/net/wireless/reg.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 68c9667d98c1..402ffaceb465 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45ef6a0bcc9cd8f13004789ec6decb52e1d3045c +refs/heads/master: 2784fe915cd25adf23ea28534019308d8a144721 diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h index 3d1c09b777e8..6dc665a727c2 100644 --- a/trunk/include/net/cfg80211.h +++ b/trunk/include/net/cfg80211.h @@ -1419,7 +1419,9 @@ struct ieee80211_txrx_stypes { /** * struct wiphy - wireless hardware description - * @reg_notifier: the driver's regulatory notification callback + * @reg_notifier: the driver's regulatory notification callback, + * note that if your driver uses wiphy_apply_custom_regulatory() + * the reg_notifier's request can be passed as NULL * @regd: the driver's regulatory domain, if one was requested via * the regulatory_hint() API. This can be used by the driver * on the reg_notifier() if it chooses to ignore future diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index 5ed615f94e0c..99d41831d76e 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -661,7 +661,8 @@ static int freq_reg_info_regd(struct wiphy *wiphy, * Follow the driver's regulatory domain, if present, unless a country * IE has been processed or a user wants to help complaince further */ - if (last_request->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE && + if (!custom_regd && + last_request->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE && last_request->initiator != NL80211_REGDOM_SET_BY_USER && wiphy->regd) regd = wiphy->regd;