فهرست منبع

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>
Johannes Berg 8 سال پیش
والد
کامیت
0507a3ac6e
1فایلهای تغییر یافته به همراه2 افزوده شده و 4 حذف شده
  1. 2 4
      net/wireless/util.c

+ 2 - 4
net/wireless/util.c

@@ -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) {
-				kfree(limits);
-				return -EINVAL;
-			}
+			    params->beacon_int_gcd < c->beacon_int_min_gcd)
+				goto cont;
 			if (!c->beacon_int_min_gcd &&
 			if (!c->beacon_int_min_gcd &&
 			    params->beacon_int_different)
 			    params->beacon_int_different)
 				goto cont;
 				goto cont;