Commit c989bb15 authored Apr 25, 2011 by Luis R. Rodriguez Committed by John W. Linville Apr 26, 2011

cfg80211: fix regresion on reg user timeout



The patch "cfg80211: add a timer for invalid user reg hints"
introduced a regression for the case where a secondary identical
regulatory hint from a user is sent. What would happen is the
second hint would schedule delayed work in to catch a timeout
but since we are never processing it given that the hint was already
applied we'd always hit the timeout and and restore regulatory
settings back to world regulatory domain. This is fixed by simply
avoiding sheduling work if the hint was already applied.

Tested-by: Felix Fietkau <nbd@openwrt.org>
Reported-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent d3bb1429

net/wireless/reg.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1455,7 +1455,8 @@ static void reg_process_hint(struct regulatory_request *reg_request)
		* We only time out user hints, given that they should be the only
		* source of bogus requests.
		*/
		if (reg_request->initiator == NL80211_REGDOM_SET_BY_USER)
		if (r != -EALREADY &&
		reg_request->initiator == NL80211_REGDOM_SET_BY_USER)
		schedule_delayed_work(&reg_timeout, msecs_to_jiffies(3142));
		}

Admin message