Commit 62e70cf8 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

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: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2d9ccf84
...@@ -621,7 +621,6 @@ enum rt2x00_flags { ...@@ -621,7 +621,6 @@ enum rt2x00_flags {
/* /*
* Driver features * Driver features
*/ */
DRIVER_SUPPORT_MIXED_INTERFACES,
DRIVER_REQUIRE_FIRMWARE, DRIVER_REQUIRE_FIRMWARE,
DRIVER_REQUIRE_BEACON_GUARD, DRIVER_REQUIRE_BEACON_GUARD,
DRIVER_REQUIRE_ATIM_QUEUE, DRIVER_REQUIRE_ATIM_QUEUE,
......
...@@ -201,13 +201,12 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw, ...@@ -201,13 +201,12 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
return -ENODEV; return -ENODEV;
/* /*
* When we don't support mixed interfaces (a combination * We don't support mixed combinations of sta and ap virtual
* of sta and ap virtual interfaces) then we can only * interfaces. We can only add this interface when the rival
* add this interface when the rival interface count is 0. * interface count is 0.
*/ */
if (!test_bit(DRIVER_SUPPORT_MIXED_INTERFACES, &rt2x00dev->flags) && if ((conf->type == IEEE80211_IF_TYPE_AP && rt2x00dev->intf_sta_count) ||
((conf->type == IEEE80211_IF_TYPE_AP && rt2x00dev->intf_sta_count) || (conf->type != IEEE80211_IF_TYPE_AP && rt2x00dev->intf_ap_count))
(conf->type != IEEE80211_IF_TYPE_AP && rt2x00dev->intf_ap_count)))
return -ENOBUFS; return -ENOBUFS;
/* /*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment