Commit 2cb7e59c authored by Luis R. Rodriguez's avatar Luis R. Rodriguez

crda: rename max() to reglib_max()

Signed-off-by: 's avatarLuis R. Rodriguez <mcgrof@do-not-panic.com>
parent 5f3a8b01
......@@ -438,7 +438,7 @@ static int reg_rules_intersect(const struct ieee80211_reg_rule *rule1,
power_rule2 = &rule2->power_rule;
power_rule = &intersected_rule->power_rule;
freq_range->start_freq_khz = max(freq_range1->start_freq_khz,
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_range2->end_freq_khz);
......
......@@ -60,7 +60,7 @@ static inline int reglib_is_valid_regdom(const char *alpha2)
return 1;
}
static inline uint32_t max(uint32_t a, uint32_t b)
static inline uint32_t reglib_max(uint32_t a, uint32_t b)
{
return (a > b) ? a : b;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment