Commit 0507a3ac authored by Johannes Berg's avatar Johannes Berg

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.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 73c7da3d
...@@ -1676,10 +1676,8 @@ int cfg80211_iter_combinations(struct wiphy *wiphy, ...@@ -1676,10 +1676,8 @@ int cfg80211_iter_combinations(struct wiphy *wiphy,
if (params->beacon_int_gcd) { if (params->beacon_int_gcd) {
if (c->beacon_int_min_gcd && if (c->beacon_int_min_gcd &&
params->beacon_int_gcd < c->beacon_int_min_gcd) { params->beacon_int_gcd < c->beacon_int_min_gcd)
kfree(limits); goto cont;
return -EINVAL;
}
if (!c->beacon_int_min_gcd && if (!c->beacon_int_min_gcd &&
params->beacon_int_different) params->beacon_int_different)
goto cont; goto cont;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment