commit: f5685ba675449b072feab6a5391a9ef9f604bc94
From: Helmut Schaa <[email protected]>
Date: Mon, 3 Dec 2012 22:35:39 +0100
Subject: rt2x00: Only specify interface combinations if more then one interface
is possible
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+]
Acked-by: Gertjan van Wingerde <[email protected]>
Acked-by: Stanislaw Gruszka <[email protected]>
Signed-off-by: John W. Linville <[email protected]>
---
drivers/net/wireless/rt2x00/rt2x00dev.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c
b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 66b3b17..3248b42 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1124,6 +1124,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.7.3.4
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
