diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2016-10-21 12:15:00 +0200 |
|---|---|---|
| committer | Lior David <liord@codeaurora.org> | 2016-11-18 14:15:29 +0200 |
| commit | 54afc7997e9ba3e279b080a8ffa9dc49bb64888a (patch) | |
| tree | a53912e3448ce9334811bc6be731c805ec67ea44 /net/wireless/util.c | |
| parent | 9a27bdb53fe5b7a0cf07c4aa3226ce8b9c9a14ad (diff) | |
cfg80211: fix beacon interval in interface combination iteration
We shouldn't abort the iteration with an error when one of the
potential combinations can't accomodate the beacon interval
request, we should just skip that particular combination. Fix
the code to do so.
CRs-Fixed: 1087922
Change-Id: Ib1ae7221291b8176d61d58e756a3814c80d98d27
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: 0507a3ac6e98f50583912ec78d07c2e4daaf2b28
[liord@codeaurora.org: cherry-pick without changes]
Signed-off-by: Lior David <liord@codeaurora.org>
Diffstat (limited to 'net/wireless/util.c')
| -rw-r--r-- | net/wireless/util.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 5fdeb1107fe6..2334d3d65173 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1600,10 +1600,8 @@ int cfg80211_iter_combinations(struct wiphy *wiphy, if (params->beacon_int_gcd) { if (c->beacon_int_min_gcd && - params->beacon_int_gcd < c->beacon_int_min_gcd) { - kfree(limits); - return -EINVAL; - } + params->beacon_int_gcd < c->beacon_int_min_gcd) + goto cont; if (!c->beacon_int_min_gcd && params->beacon_int_different) goto cont; |