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
This commit is contained in:
@@ -392,7 +392,8 @@ static bool 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 false;
|
||||
|
||||
return true;
|
||||
|
Reference in New Issue
Block a user