Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62e70cf8 authored Apr 21, 2008 by Ivo van Doorn Committed by John W. Linville May 07, 2008

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>

parent 2d9ccf84

drivers/net/wireless/rt2x00/rt2x00.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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,

drivers/net/wireless/rt2x00/rt2x00mac.c

+5 −6

Original line number	Original line	Diff line number	Diff line
	@@ -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;

	/*		/*