summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/cisco
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-05-20 19:40:35 -0400
committerDavid S. Miller <davem@davemloft.net>2016-05-20 19:40:35 -0400
commit56025caa821d8e398b7cff2c45fb1e3e769549d7 (patch)
tree59d35e89cf27eb60aab334c7a53cfa3e99dacda0 /drivers/net/wireless/cisco
parent05a56487174d33fff5986f13c0c8e4b32f046da9 (diff)
parent52776a700b53969345a3cc5daed1c797d016a188 (diff)
downloadblackbird-op-linux-56025caa821d8e398b7cff2c45fb1e3e769549d7.tar.gz
blackbird-op-linux-56025caa821d8e398b7cff2c45fb1e3e769549d7.zip
Merge tag 'wireless-drivers-next-for-davem-2016-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says: ==================== wireless-drivers patches for 4.7 Major changes: iwlwifi * remove IWLWIFI_DEBUG_EXPERIMENTAL_UCODE kconfig option * work for RX multiqueue continues * dynamic queue allocation work continues * add Luca as maintainer * a bunch of fixes and improvements all over brcmfmac * add 4356 sdio support ath6kl * add ability to set debug uart baud rate with a module parameter wil6210 * add debugfs file to configure firmware led functionality ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/cisco')
-rw-r--r--drivers/net/wireless/cisco/airo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/cisco/airo.c b/drivers/net/wireless/cisco/airo.c
index 55456f750229..ca3cd2102bd6 100644
--- a/drivers/net/wireless/cisco/airo.c
+++ b/drivers/net/wireless/cisco/airo.c
@@ -5794,7 +5794,7 @@ static int airo_set_freq(struct net_device *dev,
fwrq->m = ieee80211_frequency_to_channel(f);
}
/* Setting by channel number */
- if((fwrq->m > 1000) || (fwrq->e > 0))
+ if (fwrq->m < 0 || fwrq->m > 1000 || fwrq->e > 0)
rc = -EOPNOTSUPP;
else {
int channel = fwrq->m;
OpenPOWER on IntegriCloud