On Sun, Aug 26, 2012 at 10:12:53AM +0200, Antonio Quartulli wrote:
> This driver now advertises its allowed VIFs combination to the mac80211
> sublayer.
>
> Signed-off-by: Antonio Quartulli <ordex@xxxxxxxxxxxxx>
John I'll send v2 of this too because we also want to avoid that:
num_IBSS + num_AP <= ATH9K_HTC_MAX_BCN_VIF
and this is not the case with the current interface limitation I provided.
Cheers,
> ---
> drivers/net/wireless/ath/ath9k/htc_drv_init.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
> index a035a38..59965e2 100644
> --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
> +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
> @@ -689,6 +689,19 @@ err_hw:
> return ret;
> }
>
> +static const struct ieee80211_iface_limit if_limits[] = {
> + { .max = ATH9K_HTC_MAX_VIF, .types = BIT(NL80211_IFTYPE_STATION) },
> + { .max = ATH9K_HTC_MAX_BCN_VIF, .types = BIT(NL80211_IFTYPE_AP) },
> + { .max = 1, .types = BIT(NL80211_IFTYPE_ADHOC) },
> +};
> +
> +static const struct ieee80211_iface_combination if_comb = {
> + .limits = if_limits,
> + .n_limits = ARRAY_SIZE(if_limits),
> + .max_interfaces = ATH9K_HTC_MAX_VIF,
> + .num_different_channels = 1,
> +};
> +
> static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,
> struct ieee80211_hw *hw)
> {
> @@ -711,6 +724,9 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,
> BIT(NL80211_IFTYPE_P2P_GO) |
> BIT(NL80211_IFTYPE_P2P_CLIENT);
>
> + hw->wiphy->iface_combinations = &if_comb;
> + hw->wiphy->n_iface_combinations = 1;
> +
> hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
>
> hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN |
> --
> 1.7.12
>
> --
> 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
--
Antonio Quartulli
..each of us alone is worth nothing..
Ernesto "Che" Guevara
Attachment:
signature.asc
Description: Digital signature
