diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2008-04-21 12:59:54 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-07 15:02:20 -0400 |
commit | 62e70cf8568151a41e8525ddf0e56c0380a71cfd (patch) | |
tree | b6413cad9867a773ce3da19053d615fb53b44540 /drivers/net/wireless/rt2x00/rt2x00mac.c | |
parent | 2d9ccf842905063f774c28f329ac5ab3a84d3571 (diff) |
rt2x00: Remove DRIVER_SUPPORT_MIXED_INTERFACES
A lot more is needed to support mixed interfaces then just this flag,
such things need new redesigns in rt2x00lib to actually make it happen.
So far there doesn't exist a Ralink chipset that can handle it, so
we might as well remove the flag for now and see what should be done
whenever a device appears that can handle it.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00mac.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00mac.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index e46d406637f7..e078e0ad0d06 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c | |||
@@ -201,13 +201,12 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw, | |||
201 | return -ENODEV; | 201 | return -ENODEV; |
202 | 202 | ||
203 | /* | 203 | /* |
204 | * When we don't support mixed interfaces (a combination | 204 | * We don't support mixed combinations of sta and ap virtual |
205 | * of sta and ap virtual interfaces) then we can only | 205 | * interfaces. We can only add this interface when the rival |
206 | * add this interface when the rival interface count is 0. | 206 | * interface count is 0. |
207 | */ | 207 | */ |
208 | if (!test_bit(DRIVER_SUPPORT_MIXED_INTERFACES, &rt2x00dev->flags) && | 208 | if ((conf->type == IEEE80211_IF_TYPE_AP && rt2x00dev->intf_sta_count) || |
209 | ((conf->type == IEEE80211_IF_TYPE_AP && rt2x00dev->intf_sta_count) || | 209 | (conf->type != IEEE80211_IF_TYPE_AP && rt2x00dev->intf_ap_count)) |
210 | (conf->type != IEEE80211_IF_TYPE_AP && rt2x00dev->intf_ap_count))) | ||
211 | return -ENOBUFS; | 210 | return -ENOBUFS; |
212 | 211 | ||
213 | /* | 212 | /* |