From: Johannes Berg <johannes@sipsolutions.net>
To: linux-wireless <linux-wireless@vger.kernel.org>
Subject: [RFC] rt2x00: advertise interface combinations
Date: Fri, 13 May 2011 11:09:04 +0200 [thread overview]
Message-ID: <1305277744.3487.8.camel@jlt3.sipsolutions.net> (raw)
From: Johannes Berg <johannes.berg@intel.com>
Make rt2x00 advertise that it potentially supports
more than one AP interface.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
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);
next reply other threads:[~2011-05-13 9:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-13 9:09 Johannes Berg [this message]
2011-05-15 15:24 ` [RFC] rt2x00: advertise interface combinations Ivo Van Doorn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1305277744.3487.8.camel@jlt3.sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).