aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-05-23 15:33:44 -0700
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-05-23 15:33:44 -0700
commit35292269e1dae9d34e86f69f84c87837e38b1225 (patch)
treef155a3561c0323d77d678b978dac3e23827d9505
parent205f058e9e38b23933a339392cff8276ad7e2f53 (diff)
downloadcrda-35292269e1dae9d34e86f69f84c87837e38b1225.tar.gz
crda: port over Linux is_valid_reg_rule() change bd05f28e
This was added upstream: mcgrof@frijol ~/linux-stable (git::master)$ git describe --contains bd05f28e v2.6.29~3^2~47 commit bd05f28e1a15ae62994fe309a524695fe26dd834 Author: Roel Kluin <roel.kluin@gmail.com> Date: Tue Mar 3 22:55:21 2009 +0100 cfg80211: test before subtraction on unsigned freq_diff is unsigned, so test before subtraction Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-rw-r--r--intersect.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/intersect.c b/intersect.c
index aa67dbc..e35f2cc 100644
--- a/intersect.c
+++ b/intersect.c
@@ -30,7 +30,8 @@ static int is_valid_reg_rule(const struct ieee80211_reg_rule *rule)
freq_diff = freq_range->end_freq_khz - freq_range->start_freq_khz;
- if (freq_diff == 0 || freq_range->max_bandwidth_khz > freq_diff)
+ if (freq_range->end_freq_khz <= freq_range->start_freq_khz ||
+ freq_range->max_bandwidth_khz > freq_diff)
return 0;
return 1;