2012-12-06 09:46:25

by Helmut Schaa

[permalink] [raw]
Subject: Re: [PATCH] rt2x00: Only specify interface combinations if more then one interface is possible

Forgot to CC linux-wireless.

On Mon, Dec 3, 2012 at 10:35 PM, Helmut Schaa
<[email protected]> wrote:
> Otherwise rt2500* triggers a warning in cfg80211, from net/wireless/core.c:
>
> /* Combinations with just one interface aren't real */
> if (WARN_ON(c->max_interfaces < 2))
>
> This was introduced in commit 55d2e9da744ba11eae900b4bfc2da72eace3c1e1:
> rt2x00: Replace open coded interface checking with interface combinations.
>
> Reported-by: Stefan Lippers-Hollmann <[email protected]>
> Tested-by: Stefan Lippers-Hollmann <[email protected]>
> Signed-off-by: Helmut Schaa <[email protected]>
> Cc: [email protected] [3.7+]
> ---
> drivers/net/wireless/rt2x00/rt2x00dev.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
> index 69097d1..dafb448 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
> @@ -1123,6 +1123,9 @@ static inline void rt2x00lib_set_if_combinations(struct rt2x00_dev *rt2x00dev)
> struct ieee80211_iface_limit *if_limit;
> struct ieee80211_iface_combination *if_combination;
>
> + if (rt2x00dev->ops->max_ap_intf < 2)
> + return;
> +
> /*
> * Build up AP interface limits structure.
> */
> --
> 1.8.0
>