Don't ignore interface combinations when only one interface is up. Otherwise we may call a driver to create (or change) interface type to something it didn't report in interface combinations it reported. Change-Id: If0934c7a835ffd29f30b9343ec0e0a3e51bb0b69 Signed-off-by: Michal Kazior <michal.kazior@xxxxxxxxx> --- net/wireless/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/wireless/util.c b/net/wireless/util.c index 177df03..147f283 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -965,7 +965,7 @@ int cfg80211_can_change_interface(struct cfg80211_registered_device *rdev, } mutex_unlock(&rdev->devlist_mtx); - if (total == 1) + if (total == 1 && rdev->wiphy.n_iface_combinations == 0) return 0; for (i = 0; i < rdev->wiphy.n_iface_combinations; i++) { -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html