Skip to content

Commit

Permalink
rt2x00: Remove DRIVER_SUPPORT_MIXED_INTERFACES
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ivo van Doorn authored and John W. Linville committed May 7, 2008
1 parent 2d9ccf8 commit 62e70cf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
1 change: 0 additions & 1 deletion drivers/net/wireless/rt2x00/rt2x00.h
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,6 @@ enum rt2x00_flags {
/*
* Driver features
*/
DRIVER_SUPPORT_MIXED_INTERFACES,
DRIVER_REQUIRE_FIRMWARE,
DRIVER_REQUIRE_BEACON_GUARD,
DRIVER_REQUIRE_ATIM_QUEUE,
Expand Down
11 changes: 5 additions & 6 deletions drivers/net/wireless/rt2x00/rt2x00mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,12 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
return -ENODEV;

/*
* When we don't support mixed interfaces (a combination
* of sta and ap virtual interfaces) then we can only
* add this interface when the rival interface count is 0.
* We don't support mixed combinations of sta and ap virtual
* interfaces. We can only add this interface when the rival
* interface count is 0.
*/
if (!test_bit(DRIVER_SUPPORT_MIXED_INTERFACES, &rt2x00dev->flags) &&
((conf->type == IEEE80211_IF_TYPE_AP && rt2x00dev->intf_sta_count) ||
(conf->type != IEEE80211_IF_TYPE_AP && rt2x00dev->intf_ap_count)))
if ((conf->type == IEEE80211_IF_TYPE_AP && rt2x00dev->intf_sta_count) ||
(conf->type != IEEE80211_IF_TYPE_AP && rt2x00dev->intf_ap_count))
return -ENOBUFS;

/*
Expand Down

0 comments on commit 62e70cf

Please sign in to comment.