aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-10-15 04:22:12 -0400
committerJohannes Berg <johannes.berg@intel.com>2015-10-16 03:15:43 -0400
commitfd453d3c53eed367f18a0c75bd855cdfc9d6d416 (patch)
tree341c6f7b09081876889eff67fa694bea334070a6
parentb68630369167a7fd2c4c3d1be96430defc59fb9a (diff)
cfg80211: reg: rename reg_regdb_query() to reg_query_builtin()
The new name better reflects the functionality. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/wireless/reg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 55462fe04d5d..85cad884a6e5 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -478,7 +478,7 @@ static void reg_regdb_apply(struct work_struct *work)
478 478
479static DECLARE_WORK(reg_regdb_work, reg_regdb_apply); 479static DECLARE_WORK(reg_regdb_work, reg_regdb_apply);
480 480
481static int reg_regdb_query(const char *alpha2) 481static int reg_query_builtin(const char *alpha2)
482{ 482{
483 const struct ieee80211_regdomain *regdom = NULL; 483 const struct ieee80211_regdomain *regdom = NULL;
484 struct reg_regdb_apply_request *request; 484 struct reg_regdb_apply_request *request;
@@ -521,7 +521,7 @@ static void reg_regdb_size_check(void)
521} 521}
522#else 522#else
523static inline void reg_regdb_size_check(void) {} 523static inline void reg_regdb_size_check(void) {}
524static inline int reg_regdb_query(const char *alpha2) 524static inline int reg_query_builtin(const char *alpha2)
525{ 525{
526 return -ENODATA; 526 return -ENODATA;
527} 527}
@@ -605,7 +605,7 @@ static inline int call_crda(const char *alpha2)
605static bool reg_query_database(struct regulatory_request *request) 605static bool reg_query_database(struct regulatory_request *request)
606{ 606{
607 /* query internal regulatory database (if it exists) */ 607 /* query internal regulatory database (if it exists) */
608 if (reg_regdb_query(request->alpha2) == 0) 608 if (reg_query_builtin(request->alpha2) == 0)
609 return true; 609 return true;
610 610
611 if (call_crda(request->alpha2) == 0) 611 if (call_crda(request->alpha2) == 0)