commit 64ee9bddeba4ce3adee95c46d00bfaf935b60770
author Mihir Shete <smihir@codeaurora.org> Tue Oct 29 19:54:03 2013 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Dec 13 03:59:20 2013 -0800
tree f752a8faad846c113f35b93fcaa9c6d4bb7997db
parent 09b3d7972025ff9e654b8cce3453b5d9f205cbf8

cfg80211: fix set_regdom() to cancel requests with same alpha2

Use a different error code if the regdomain is same and then
set the request processed so that it doesn't block new
requests.

Git-commit: 959085352b7c44ff9bae4d8a4d76146193260e4c
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
Author: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Thu Jul 12 15:33:58 2012 +0300

Change-Id: I8cbcf80bb43d983c72cf9037f30e11ae8d329b06
Signed-off-by: Mihir Shete <smihir@codeaurora.org>

net/wireless/reg.c

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 30eca9d..eee492d 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2131,7 +2131,7 @@
 		 * checking if the alpha2 changes if CRDA was already called
 		 */
 		if (!regdom_changes(rd->alpha2))
-			return -EINVAL;
+			return -EALREADY;
 	}
 
 	/*
@@ -2251,6 +2251,9 @@
 	/* Note that this doesn't update the wiphys, this is done below */
 	r = __set_regdom(rd);
 	if (r) {
+		if (r == -EALREADY)
+			reg_set_request_processed();
+
 		kfree(rd);
 		mutex_unlock(&reg_mutex);
 		return r;