On Sun, May 11, 2014 at 1:50 AM, Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> wrote: > From: Arik Nemtsov <arik@xxxxxxxxxx> > > Otherwise every "indoor" setting by usermode will cause a regdomain reset. > > Change-Id: I3225325d9fb956174458d386d4dd0f4e069deb58 > Signed-off-by: Arik Nemtsov <arikx.nemtsov@xxxxxxxxx> > Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> > --- > net/wireless/reg.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/net/wireless/reg.c b/net/wireless/reg.c > index e78f532..558b0e3 100644 > --- a/net/wireless/reg.c > +++ b/net/wireless/reg.c > @@ -1876,7 +1876,8 @@ static void reg_process_hint(struct regulatory_request *reg_request) > case NL80211_REGDOM_SET_BY_USER: > treatment = reg_process_hint_user(reg_request); > if (treatment == REG_REQ_IGNORE || > - treatment == REG_REQ_ALREADY_SET) > + treatment == REG_REQ_ALREADY_SET || > + treatment == REG_REQ_USER_HINT_HANDLED) > return; > queue_delayed_work(system_power_efficient_wq, > ®_timeout, msecs_to_jiffies(3142)); This patch would create a conflict with Janusz's patch, but otherwise it looks fine to me. Acked-by: Luis R. Rodriguez <mcgrof@xxxxxxxx> 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
