aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2010-11-18 00:46:07 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-11-22 15:48:50 -0500
commitf333a7a2f49e2a9b46f8d18962bd750b18beeecd (patch)
tree211eef7a662424cdf8afdfa9db622031b876f553 /net/wireless
parent31e99729ae66d8b74316547c40eed15172f14ea8 (diff)
cfg80211: move reg_work and reg_todo above
These will be used earlier in the next few patches. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Tested-by: Mark Mentovai <mark@moxienet.com> Tested-by: Bruno Randolf <br1@einfach.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/reg.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 9830db61019e..3fa247488f87 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -96,6 +96,9 @@ struct reg_beacon {
96 struct ieee80211_channel chan; 96 struct ieee80211_channel chan;
97}; 97};
98 98
99static void reg_todo(struct work_struct *work);
100static DECLARE_WORK(reg_work, reg_todo);
101
99/* We keep a static world regulatory domain in case of the absence of CRDA */ 102/* We keep a static world regulatory domain in case of the absence of CRDA */
100static const struct ieee80211_regdomain world_regdom = { 103static const struct ieee80211_regdomain world_regdom = {
101 .n_reg_rules = 5, 104 .n_reg_rules = 5,
@@ -1494,8 +1497,6 @@ static void reg_todo(struct work_struct *work)
1494 reg_process_pending_beacon_hints(); 1497 reg_process_pending_beacon_hints();
1495} 1498}
1496 1499
1497static DECLARE_WORK(reg_work, reg_todo);
1498
1499static void queue_regulatory_request(struct regulatory_request *request) 1500static void queue_regulatory_request(struct regulatory_request *request)
1500{ 1501{
1501 if (isalpha(request->alpha2[0])) 1502 if (isalpha(request->alpha2[0]))