Hi,
On Fri, May 13, 2011 at 11:09 AM, Johannes Berg
<johannes@xxxxxxxxxxxxxxxx> wrote:
> 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);
I don't think this WARN_ON will be needed, but with this entire patch,
I think that our own code for checking the interface limitations are no
longer needed. But I will clean that up later in a separate patch.
So for now:
Acked-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
--
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
