| From f5685ba675449b072feab6a5391a9ef9f604bc94 Mon Sep 17 00:00:00 2001 |
| From: Helmut Schaa <helmut.schaa@googlemail.com> |
| Date: Mon, 3 Dec 2012 22:35:39 +0100 |
| Subject: rt2x00: Only specify interface combinations if more then one interface is possible |
| |
| From: Helmut Schaa <helmut.schaa@googlemail.com> |
| |
| commit f5685ba675449b072feab6a5391a9ef9f604bc94 upstream. |
| |
| 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 <s.l-h@gmx.de> |
| Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> |
| Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> |
| Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> |
| Acked-by: Stanislaw Gruszka <sgruszka@redhat.com> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/wireless/rt2x00/rt2x00dev.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/net/wireless/rt2x00/rt2x00dev.c |
| +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c |
| @@ -1123,6 +1123,9 @@ static inline void rt2x00lib_set_if_comb |
| 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. |
| */ |
