compat-wireless: Enable changing regulatory domain
Subsystems (2)
RFC 3/7 compat-wireless: Enable changing regulatory domain
From: Johan Lilje <[email protected]>
Date: Tue, 2 Aug 2011 09:21:49 +0200
If compat-wireless code is compiled into the kernel, first request regulatory hint fails to return since userspace is not ready yet.
Added timeout mechanism to remove old pending requests.
--- include/net/regulatory.h | 3 +++ net/wireless/reg.c | 26 +++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-)
include/net/regulatory.h +3 -0
@@ -61,6 +61,8 @@ enum environment_cap {* country IE * @country_ie_env: lets us know if the AP is telling us we are outdoor, * indoor, or if it doesn't matter +* @timestamp: stores the time when this request calls crda, to enable +* timeout mechanism. * @list: used to insert into the reg_requests_list linked list */ struct regulatory_request {
@@ -70,6 +72,7 @@ struct regulatory_request {bool intersect;bool processed;enum environment_cap country_ie_env; +struct timespec timestamp;struct list_head list; };
net/wireless/reg.c +23 -3
@@ -35,6 +35,7 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/time.h> #include <linux/kernel.h> #include <linux/export.h> #include <linux/slab.h>
@@ -1433,6 +1434,9 @@ new_request:return r; } +/* Get timestamp */ +getnstimeofday (&(last_request->timestamp)); +return call_crda (last_request->alpha2); }
@@ -1479,15 +1483,31 @@ static void reg_process_hint(struct regulatory_request *reg_request)static void reg_process_pending_hints (void ) {struct regulatory_request *reg_request; +struct timespec time_diff; +struct timespec timestamp_now;mutex_lock (&cfg80211_mutex);mutex_lock (®_mutex);/* When last_request->processed becomes true this will be rescheduled */ if (last_request && !last_request->processed) { -REG_DBG_PRINT ("Pending regulatory request, waiting " -"for it to be processed...\n" ); - goto out; +/* Get time since last request */ +if (last_request->timestamp.tv_nsec) { +getnstimeofday (×tamp_now); + time_diff =timespec_sub (timestamp_now, + last_request->timestamp); + } + +/* Previous call to CRDA did not return within 2 seconds */ +if (time_diff.tv_sec >2 ) { +REG_DBG_PRINT ("Regulatory request timeout, " +"removing pending hint\n" ); +reg_set_request_processed (); + }else { +REG_DBG_PRINT ("Pending regulatory request, waiting " +"for it to be processed...\n" ); + goto out; + } }spin_lock (®_requests_lock);
Signature · 1 line
1.7.1
Hi Dmitry,
Some minor comments on this patch:
Note that I'm not a maintainer and that these are comments on the patch itself, not the code it adds.
Quoted 8 lines · Dmitry Tarnyagin
From: Johan Lilje <[email protected]>
Date: Tue, 2 Aug 2011 09:21:49 +0200If compat-wireless code is compiled into the kernel, first request regulatory hint fails to return since userspace is not ready yet.
Added timeout mechanism to remove old pending requests.
Quoted 4 lines
Signed-off-by Johan Lilje <[email protected]>---
include/net/regulatory.h | 3 +++net/wireless/reg.c| 26 +++++++++++++++++++++++---
Again, you're updating files that aren't part of the compat-wireless repository. Are you sure this patch is correct?
Thanks,
Signature · 5 lines
Julian Calaby Email: [email protected] Profile: http://www.google.com/profiles/julian.calaby/ .Plan: http://sites.google.com/site/juliancalaby/
Johannes Berg
maintainerQuoted 7 lines · Dmitry Tarnyagin
From: Johan Lilje <[email protected]>
Date: Tue, 2 Aug 2011 09:21:49 +0200If compat-wireless code is compiled into the kernel, first request regulatory hint fails to return since userspace is not ready yet.
Added timeout mechanism to remove old pending requests.
Completely wrong description. Make your patches apply to the kernel, not compat-wireless.
include/net/regulatory.h struct regulatory_request { · line 75
Quoted 10 lines
+ * @timestamp: stores the time when this request calls crda, to enable
+ * timeout mechanism.
* @list: used to insert into thereg_requests_listlinked list */
structregulatory_request{include/net/regulatory.h +1
-0@@ -70,6 +72,7 @@ struct regulatory_request {bool intersect;bool processed;enum environment_cap country_ie_env; +struct timespec timestamp;
Seriously? You've gotta be kidding. WAAYY overkill to use timespec. Just use jiffies.
johannes