From: Andrei Otcheretianski <andrei.otcheretianski@xxxxxxxxx> Previously, interface combination check in mac80211 considered only interfaces that have channel context. This wouldn't take P2P device interfaces into account at all. Also for managed interfaces the channel context is bound upon association and the combination check is performed when the iface is brought up. Fix this by counting the numbers of running interfaces instead of number of interfaces that have channel context. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@xxxxxxxxx> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> --- net/mac80211/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/util.c b/net/mac80211/util.c index e664b28..36d8cb2 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -3245,7 +3245,7 @@ int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata, wdev_iter = &sdata_iter->wdev; if (sdata_iter == sdata || - rcu_access_pointer(sdata_iter->vif.chanctx_conf) == NULL || + !ieee80211_sdata_running(sdata_iter) || local->hw.wiphy->software_iftypes & BIT(wdev_iter->iftype)) continue; -- 1.9.1 -- 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
