Merge "cfg80211: fix beacon interval in interface combination iteration"

This commit is contained in:
Linux Build Service Account 2016-11-24 06:13:18 -08:00 committed by Gerrit - the friendly Code Review server
commit 2fb4ab87aa

View file

@ -1600,10 +1600,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;