diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-05-30 14:53:04 -0700 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-05-30 18:54:52 -0700 |
commit | 285ab7d82d3b1d970ef77215fd25af8621d05d4d (patch) | |
tree | fd3b3aadbfeb91487d4fa8f3f7cd917f367103fc | |
parent | 2cb7e59c1e46d176f480c85e5fcae5d6abfd9ecc (diff) | |
download | crda-285ab7d82d3b1d970ef77215fd25af8621d05d4d.tar.gz |
crda: rename min() to reglib_min()
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-rw-r--r-- | reglib.c | 8 | ||||
-rw-r--r-- | reglib.h | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -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; @@ -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; } |