Commit 0507a3ac authored Oct 21, 2016 by 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: Johannes Berg <johannes.berg@intel.com>

parent 73c7da3d

net/wireless/util.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1676,10 +1676,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;