| Message ID | 201105140035.06559.chunkeey@googlemail.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Sat, 2011-05-14 at 00:35 +0200, Christian Lamparter wrote: > In order to provide multiple interfaces for a single device, > the driver is now required to advertise all possible > interface configurations to the stack. Cool, thanks! Note that currently it's not yet required, but whatever :-) > with the standard firmware, iw now displays: > [...] > valid interface combinations: > * #{ IBSS, managed, AP, P2P-client, P2P-GO } <= 2, > total <= 2, #channels <= 1 Since mac80211 doesn't allow multiple IBSS interfaces, I think you should leave that out. And I should probably make mac80211 complain if it's advertised erroneously. johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Saturday 14 May 2011 01:28:20 Johannes Berg wrote: > On Sat, 2011-05-14 at 00:35 +0200, Christian Lamparter wrote: > > In order to provide multiple interfaces for a single device, > > the driver is now required to advertise all possible > > interface configurations to the stack. > > Cool, thanks! Note that currently it's not yet required, but > whatever :-) "currently" :D "I want to make you aware that I plan to remove the WIPHY_FLAG_ENFORCE_COMBINATIONS flag again soon, so that all drivers that don't advertise valid combinations will not be able to have multiple virtual interfaces." > > with the standard firmware, iw now displays: > > [...] > > valid interface combinations: > > * #{ IBSS, managed, AP, P2P-client, P2P-GO } <= 2, > > total <= 2, #channels <= 1 > > Since mac80211 doesn't allow multiple IBSS interfaces, I think you > should leave that out. And I should probably make mac80211 complain if > it's advertised erroneously. what about "valid" configurations like: 1 IBSS + 1 AP [STA/P2P make less sense]? (only one IBSS) Regards, Chr -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, 2011-05-14 at 01:39 +0200, Christian Lamparter wrote: > > Cool, thanks! Note that currently it's not yet required, but > > whatever :-) > "currently" :D > > "I want to make you aware that I plan to remove the > WIPHY_FLAG_ENFORCE_COMBINATIONS flag again soon, so that all > drivers that don't advertise valid combinations will not be able to have > multiple virtual interfaces." :P I think it's a bit of a mess to have drivers advertise no combinations yet still support them. But of course any userspace application that makes use of the advertising will just think it's not supported anyway, so it doesn't matter all that much. > > > with the standard firmware, iw now displays: > > > [...] > > > valid interface combinations: > > > * #{ IBSS, managed, AP, P2P-client, P2P-GO } <= 2, > > > total <= 2, #channels <= 1 > > > > Since mac80211 doesn't allow multiple IBSS interfaces, I think you > > should leave that out. And I should probably make mac80211 complain if > > it's advertised erroneously. > what about "valid" configurations like: > 1 IBSS + 1 AP [STA/P2P make less sense]? > (only one IBSS) In theory mac80211 supports that, yeah. Not sure it makes any sense ... You could advertise it that way by adding a "one IBSS only" ieee80211_iface_limit to the combination, so it'll look like this: * #{ IBSS } <= 1, #{ managed, AP, P2P-client, P2P-GO } <= 2, total <= 2 Truth though is that due to the channel restriction that will only be possible if you lock the IBSS to a channel. I guess the question is if it makes sense to list IBSS at all, or if you want to just remove it and not have to worry about TSF sync issues and all that. But I can't say I really care. johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h index 71d6d07..dbce999 100644 --- a/drivers/net/wireless/ath/carl9170/carl9170.h +++ b/drivers/net/wireless/ath/carl9170/carl9170.h @@ -287,6 +287,10 @@ struct ar9170 { unsigned int tx_seq_table; } fw; + /* interface configuration combinations */ + struct ieee80211_iface_limit if_comb_limits[1]; + struct ieee80211_iface_combination if_combs[1]; + /* reset / stuck frames/queue detection */ struct work_struct restart_work; struct work_struct ping_work; diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c index 9517ede..8ec27b8 100644 --- a/drivers/net/wireless/ath/carl9170/fw.c +++ b/drivers/net/wireless/ath/carl9170/fw.c @@ -300,6 +300,17 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len) } } + ar->if_comb_limits[0].max = ar->fw.vif_num; + ar->if_comb_limits[0].types = ar->hw->wiphy->interface_modes; + + ar->if_combs[0].num_different_channels = 1; + ar->if_combs[0].max_interfaces = ar->fw.vif_num; + ar->if_combs[0].limits = ar->if_comb_limits; + ar->if_combs[0].n_limits = ARRAY_SIZE(ar->if_comb_limits); + + ar->hw->wiphy->iface_combinations = ar->if_combs; + ar->hw->wiphy->n_iface_combinations = ARRAY_SIZE(ar->if_combs); + txsq_desc = carl9170_fw_find_desc(ar, TXSQ_MAGIC, sizeof(*txsq_desc), CARL9170FW_TXSQ_DESC_CUR_VER);
In order to provide multiple interfaces for a single device, the driver is now required to advertise all possible interface configurations to the stack. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> --- with the standard firmware, iw now displays: [...] valid interface combinations: * #{ IBSS, managed, AP, P2P-client, P2P-GO } <= 2, total <= 2, #channels <= 1 [...] --- -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html