From: Johannes Berg <johannes.berg@xxxxxxxxx>
Make rt2x00 advertise that it potentially supports
more than one AP interface.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
---
I don't have any rt2x00 HW so this is completely untested. It compiles
though ;-)
drivers/net/wireless/rt2x00/rt2x00.h | 6 ++++++
drivers/net/wireless/rt2x00/rt2x00dev.c | 19 +++++++++++++++++++
2 files changed, 25 insertions(+)
--- a/drivers/net/wireless/rt2x00/rt2x00.h 2011-05-13 11:02:38.000000000 +0200
+++ b/drivers/net/wireless/rt2x00/rt2x00.h 2011-05-13 11:03:28.000000000 +0200
@@ -960,6 +960,12 @@ struct rt2x00_dev {
* Protect the interrupt mask register.
*/
spinlock_t irqmask_lock;
+
+ /*
+ * Interface combinations
+ */
+ struct ieee80211_iface_limit ap_limit;
+ struct ieee80211_iface_combination ap_combination;
};
/*
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c 2011-05-13 11:00:28.000000000 +0200
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c 2011-05-13 11:08:04.000000000 +0200
@@ -942,6 +942,25 @@ static int rt2x00lib_probe_hw(struct rt2
#undef RT2X00_TASKLET_INIT
/*
+ * Initialise supported virtual interface combinations
+ *
+ * Since currently, max_sta_intf is always 1, ignore it.
+ */
+ WARN_ON(rt2x00dev->ops->max_sta_intf != 1);
+ if (rt2x00dev->ops->max_ap_intf > 1) {
+ rt2x00dev->ap_limit.max = rt2x00dev->ops->max_ap_intf;
+ rt2x00dev->ap_limit.types = BIT(NL80211_IFTYPE_AP);
+ rt2x00dev->ap_combination.num_different_channels = 1;
+ rt2x00dev->ap_combination.max_interfaces =
+ rt2x00dev->ops->max_ap_intf;
+ rt2x00dev->ap_combination.limits = &rt2x00dev->ap_limit;
+ rt2x00dev->ap_combination.n_limits = 1;
+ rt2x00dev->hw->wiphy->iface_combinations =
+ &rt2x00dev->ap_combination;
+ rt2x00dev->hw->wiphy->n_iface_combinations = 1;
+ }
+
+ /*
* Register HW.
*/
status = ieee80211_register_hw(rt2x00dev->hw);
--
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
