summaryrefslogtreecommitdiff
path: root/net/wireless/util.c
diff options
context:
space:
mode:
authorPurushottam Kushwaha <pkushwah@qti.qualcomm.com>2016-08-11 15:14:02 +0530
committerLior David <liord@codeaurora.org>2016-11-18 14:13:42 +0200
commit9a27bdb53fe5b7a0cf07c4aa3226ce8b9c9a14ad (patch)
treea668b44fb18b6ade5c423aae7b9bfa0b7e5af17e /net/wireless/util.c
parented8559eaeb2d950c0ac616cf0b69832186b07fea (diff)
cfg80211: identically validate beacon interval for AP/MESH/IBSS
Beacon interval interface combinations validation was missing for MESH/IBSS join, add those. Johannes: also move the beacon interval check disallowing really tiny and really big intervals into the common function, which adds it for AP mode. CRs-Fixed: 1087922 Change-Id: I282300533dcd80f65c9ba366246d028a6130ffff Signed-off-by: Purushottam Kushwaha <pkushwah@qti.qualcomm.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git Git-commit: 12d20fc9186a742d40e824f575df5aa62be31d69 [liord@codeaurora.org: fix conflicts and trivial compile errors] Signed-off-by: Lior David <liord@codeaurora.org>
Diffstat (limited to 'net/wireless/util.c')
-rw-r--r--net/wireless/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 71fcbcbb9caa..5fdeb1107fe6 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1490,7 +1490,7 @@ int cfg80211_validate_beacon_int(struct cfg80211_registered_device *rdev,
.beacon_int_gcd = beacon_int, /* GCD(n) = n */
};
- if (!beacon_int)
+ if (beacon_int < 10 || beacon_int > 10000)
return -EINVAL;
params.iftype_num[iftype] = 1;