On 12 March 2015 at 07:53, Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> wrote: > > 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; > Hello, Seems this one break IBSS case when started from wpa_supplicant at least for Intel7260 and ath10k where dedicated p2p_device is used. This is wpa_supplicant log: 1427867673.149187: nl80211: Set mode ifindex 8 iftype 1 (ADHOC) 1427867673.149225: nl80211: Mode change succeeded while interface is down 1427867673.149234: Could not set interface wlan3 flags (UP): Device or resource busy 1427867673.149237: nl80211: Failed to set interface up after switching mode 1427867673.149238: nl80211: Interface mode change to 1 from 1 failed 1427867673.149240: nl80211: Failed to set interface into IBSS mode 1427867673.149251: wlan3: Association request to the driver failed BR Janusz -- 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
