[wireless-regdb] [PATCH 32/40] crda: rename min() to reglib_min()

[Luis R. Rodriguez]

From: "Luis R. Rodriguez" <mcgrof at do-not-panic.com>

Signed-off-by: Luis R. Rodriguez <mcgrof at do-not-panic.com>
---
 reglib.c |    8 ++++----
 reglib.h |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/reglib.c b/reglib.c
index 57bb22b..4643fa8 100644
--- a/reglib.c
+++ b/reglib.c
@@ -440,18 +440,18 @@ static int reg_rules_intersect(const struct ieee80211_reg_rule *rule1,
 
 	freq_range->start_freq_khz = reglib_max(freq_range1->start_freq_khz,
 					 freq_range2->start_freq_khz);
-	freq_range->end_freq_khz = min(freq_range1->end_freq_khz,
+	freq_range->end_freq_khz = reglib_min(freq_range1->end_freq_khz,
 				       freq_range2->end_freq_khz);
-	freq_range->max_bandwidth_khz = min(freq_range1->max_bandwidth_khz,
+	freq_range->max_bandwidth_khz = reglib_min(freq_range1->max_bandwidth_khz,
 					    freq_range2->max_bandwidth_khz);
 
 	freq_diff = freq_range->end_freq_khz - freq_range->start_freq_khz;
 	if (freq_range->max_bandwidth_khz > freq_diff)
 		freq_range->max_bandwidth_khz = freq_diff;
 
-	power_rule->max_eirp = min(power_rule1->max_eirp,
+	power_rule->max_eirp = reglib_min(power_rule1->max_eirp,
 		power_rule2->max_eirp);
-	power_rule->max_antenna_gain = min(power_rule1->max_antenna_gain,
+	power_rule->max_antenna_gain = reglib_min(power_rule1->max_antenna_gain,
 		power_rule2->max_antenna_gain);
 
 	intersected_rule->flags = rule1->flags | rule2->flags;
diff --git a/reglib.h b/reglib.h
index 21518d2..8a31e0d 100644
--- a/reglib.h
+++ b/reglib.h
@@ -65,7 +65,7 @@ static inline uint32_t reglib_max(uint32_t a, uint32_t b)
 	return (a > b) ? a : b;
 }
 
-static inline uint32_t min(uint32_t a, uint32_t b)
+static inline uint32_t reglib_min(uint32_t a, uint32_t b)
 {
 	return (a > b) ? b : a;
 }
-- 
1.7.10.4