diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-10 08:04:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-10 08:04:16 -0400 |
| commit | d5df2a16133f4eb22f9a6bbc07723443568d362f (patch) | |
| tree | 7135c9054db234feec6001c6d938a715b29e2370 /net | |
| parent | d4a4aba61731ce6d102a6a93e22b8fa26511c9d5 (diff) | |
| parent | db434ac6bff0d991d0b60166dc9d6405b873d0f7 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x_main.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/rt2x00/rt73usb.c
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/reg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index ce66bfdf57ec..58df98f10990 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
| @@ -392,7 +392,8 @@ static bool is_valid_reg_rule(const struct ieee80211_reg_rule *rule) | |||
| 392 | 392 | ||
| 393 | freq_diff = freq_range->end_freq_khz - freq_range->start_freq_khz; | 393 | freq_diff = freq_range->end_freq_khz - freq_range->start_freq_khz; |
| 394 | 394 | ||
| 395 | if (freq_diff <= 0 || freq_range->max_bandwidth_khz > freq_diff) | 395 | if (freq_range->end_freq_khz <= freq_range->start_freq_khz || |
| 396 | freq_range->max_bandwidth_khz > freq_diff) | ||
| 396 | return false; | 397 | return false; |
| 397 | 398 | ||
| 398 | return true; | 399 | return true; |