Message ID | CAGXE3d-xwQArEMM030ht04JDJueHTX3YJp+O6Mmt+LVaPpp1Cg@mail.gmail.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
Hi On Monday 03 December 2012, Helmut Schaa wrote: > On Mon, Dec 3, 2012 at 4:11 PM, Stefan Lippers-Hollmann <s.L-H@gmx.de> wrote: > > Using kernel v3.7-rc7-176-g7e5530a (current mainline HEAD), I notice > > the following WARN_ON() triggering with rt2500usb and no wireless > > interface appears. > > Mind to try the patch below? […] Thanks a lot, this patch works perfectly. > From 4e4223674e2e76ca7a8e449fccd1e0a2d326fc7b Mon Sep 17 00:00:00 2001 > From: Helmut Schaa <helmut.schaa@googlemail.com> > Date: Mon, 3 Dec 2012 19:45:42 +0100 > Subject: [PATCH] rt2x00: Only specify interface combinations if more then one > interface is possible > > Otherwise this 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> perhaps also Cc: stable@vger.kernel.org # v3.7 as it might not reach Linus in time for v3.7 > Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> > --- > 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) ^whitespace damage Regards Stefan Lippers-Hollmann -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Dec 03, 2012 at 07:53:06PM +0100, Helmut Schaa wrote: > On Mon, Dec 3, 2012 at 4:11 PM, Stefan Lippers-Hollmann <s.L-H@gmx.de> wrote: > > Using kernel v3.7-rc7-176-g7e5530a (current mainline HEAD), I notice > > the following WARN_ON() triggering with rt2500usb and no wireless > > interface appears. > > Mind to try the patch below? > > Thanks, > Helmut > > > > From 4e4223674e2e76ca7a8e449fccd1e0a2d326fc7b Mon Sep 17 00:00:00 2001 > From: Helmut Schaa <helmut.schaa@googlemail.com> > Date: Mon, 3 Dec 2012 19:45:42 +0100 > Subject: [PATCH] rt2x00: Only specify interface combinations if more then one > interface is possible > > Otherwise this 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> > Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> Acked-by: Stanislaw Gruszka <sgruszka@redhat.com> Patch should be probably reposted to get applied by John ... Stanislaw -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Dec 6, 2012 at 10:09 AM, Stanislaw Gruszka <sgruszka@redhat.com> wrote:
> Patch should be probably reposted to get applied by John ...
Already did that but forgot to CC the list :/
Thanks,
Helmut
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
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.