diff options
author | Yogesh Ashok Powar <yogeshp@marvell.com> | 2012-11-06 08:52:16 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-11-14 14:56:07 -0500 |
commit | 5d377fcaf48cc38882bb92c3b4a0cfcfb250087b (patch) | |
tree | ec0b84c774141b806946ae8bdab89f4134624eea | |
parent | 601216e12c65e131453941962f2a8f6e49a2a379 (diff) |
mwl8k: defining interface combinations
AP mode support upto 8 interfaces.
Defining it using iface_combinations
Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/mwl8k.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 5099e5375cb..cb5594d433b 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -5617,6 +5617,18 @@ fail: | |||
5617 | return rc; | 5617 | return rc; |
5618 | } | 5618 | } |
5619 | 5619 | ||
5620 | static const struct ieee80211_iface_limit ap_if_limits[] = { | ||
5621 | { .max = 8, .types = BIT(NL80211_IFTYPE_AP) }, | ||
5622 | }; | ||
5623 | |||
5624 | static const struct ieee80211_iface_combination ap_if_comb = { | ||
5625 | .limits = ap_if_limits, | ||
5626 | .n_limits = ARRAY_SIZE(ap_if_limits), | ||
5627 | .max_interfaces = 8, | ||
5628 | .num_different_channels = 1, | ||
5629 | }; | ||
5630 | |||
5631 | |||
5620 | static int mwl8k_firmware_load_success(struct mwl8k_priv *priv) | 5632 | static int mwl8k_firmware_load_success(struct mwl8k_priv *priv) |
5621 | { | 5633 | { |
5622 | struct ieee80211_hw *hw = priv->hw; | 5634 | struct ieee80211_hw *hw = priv->hw; |
@@ -5696,8 +5708,13 @@ static int mwl8k_firmware_load_success(struct mwl8k_priv *priv) | |||
5696 | goto err_free_cookie; | 5708 | goto err_free_cookie; |
5697 | 5709 | ||
5698 | hw->wiphy->interface_modes = 0; | 5710 | hw->wiphy->interface_modes = 0; |
5699 | if (priv->ap_macids_supported || priv->device_info->fw_image_ap) | 5711 | |
5712 | if (priv->ap_macids_supported || priv->device_info->fw_image_ap) { | ||
5700 | hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP); | 5713 | hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP); |
5714 | hw->wiphy->iface_combinations = &ap_if_comb; | ||
5715 | hw->wiphy->n_iface_combinations = 1; | ||
5716 | } | ||
5717 | |||
5701 | if (priv->sta_macids_supported || priv->device_info->fw_image_sta) | 5718 | if (priv->sta_macids_supported || priv->device_info->fw_image_sta) |
5702 | hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_STATION); | 5719 | hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_STATION); |
5703 | 5720 | ||