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