Commit 20edb50e authored by John W. Linville's avatar John W. Linville Committed by Johannes Berg
Browse files

mac80211: remove PID rate control 



Minstrel has long since proven its worth.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 7171511e

MAINTAINERS

+0 −10
Original line number Diff line number Diff line
@@ -5629,16 +5629,6 @@ F: Documentation/networking/mac80211-injection.txt 
F:	include/net/mac80211.h

F:	net/mac80211/



MAC80211 PID RATE CONTROL

M:	Stefano Brivio <stefano.brivio@polimi.it>

M:	Mattias Nissler <mattias.nissler@gmx.de>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

S:	Maintained

F:	net/mac80211/rc80211_pid*



MACVLAN DRIVER

M:	Patrick McHardy <kaber@trash.net>

L:	netdev@vger.kernel.org

net/mac80211/Kconfig

+0 −17
Original line number Diff line number Diff line
@@ -19,14 +19,6 @@ if MAC80211 != n 
config MAC80211_HAS_RC

	bool



config MAC80211_RC_PID

	bool "PID controller based rate control algorithm" if EXPERT

	select MAC80211_HAS_RC

	---help---

	  This option enables a TX rate control algorithm for

	  mac80211 that uses a PID controller to select the TX

	  rate.



config MAC80211_RC_MINSTREL

	bool "Minstrel" if EXPERT

	select MAC80211_HAS_RC
@@ -51,14 +43,6 @@ choice 
	  overridden through the ieee80211_default_rc_algo module

	  parameter if different algorithms are available.



config MAC80211_RC_DEFAULT_PID

	bool "PID controller based rate control algorithm"

	depends on MAC80211_RC_PID

	---help---

	  Select the PID controller based rate control as the

	  default rate control algorithm. You should choose

	  this unless you know what you are doing.



config MAC80211_RC_DEFAULT_MINSTREL

	bool "Minstrel"

	depends on MAC80211_RC_MINSTREL
@@ -72,7 +56,6 @@ config MAC80211_RC_DEFAULT 
	string

	default "minstrel_ht" if MAC80211_RC_DEFAULT_MINSTREL && MAC80211_RC_MINSTREL_HT

	default "minstrel" if MAC80211_RC_DEFAULT_MINSTREL

	default "pid" if MAC80211_RC_DEFAULT_PID

	default ""



endif

net/mac80211/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -47,17 +47,12 @@ mac80211-$(CONFIG_PM) += pm.o 


CFLAGS_trace.o := -I$(src)



# objects for PID algorithm

rc80211_pid-y := rc80211_pid_algo.o

rc80211_pid-$(CONFIG_MAC80211_DEBUGFS) += rc80211_pid_debugfs.o



rc80211_minstrel-y := rc80211_minstrel.o

rc80211_minstrel-$(CONFIG_MAC80211_DEBUGFS) += rc80211_minstrel_debugfs.o



rc80211_minstrel_ht-y := rc80211_minstrel_ht.o

rc80211_minstrel_ht-$(CONFIG_MAC80211_DEBUGFS) += rc80211_minstrel_ht_debugfs.o



mac80211-$(CONFIG_MAC80211_RC_PID) += $(rc80211_pid-y)

mac80211-$(CONFIG_MAC80211_RC_MINSTREL) += $(rc80211_minstrel-y)

mac80211-$(CONFIG_MAC80211_RC_MINSTREL_HT) += $(rc80211_minstrel_ht-y)

net/mac80211/main.c

+0 −7
Original line number Diff line number Diff line
@@ -1187,18 +1187,12 @@ static int __init ieee80211_init(void) 
	if (ret)

		goto err_minstrel;



	ret = rc80211_pid_init();

	if (ret)

		goto err_pid;



	ret = ieee80211_iface_init();

	if (ret)

		goto err_netdev;



	return 0;

 err_netdev:

	rc80211_pid_exit();

 err_pid:

	rc80211_minstrel_ht_exit();

 err_minstrel:

	rc80211_minstrel_exit();
@@ -1208,7 +1202,6 @@ static int __init ieee80211_init(void) 


static void __exit ieee80211_exit(void)

{

	rc80211_pid_exit();

	rc80211_minstrel_ht_exit();

	rc80211_minstrel_exit();

net/mac80211/rate.h

+0 −13
Original line number Diff line number Diff line
@@ -143,19 +143,6 @@ void rate_control_deinitialize(struct ieee80211_local *local); 




/* Rate control algorithms */

#ifdef CONFIG_MAC80211_RC_PID

int rc80211_pid_init(void);

void rc80211_pid_exit(void);

#else

static inline int rc80211_pid_init(void)

{

	return 0;

}

static inline void rc80211_pid_exit(void)

{

}

#endif



#ifdef CONFIG_MAC80211_RC_MINSTREL

int rc80211_minstrel_init(void);

void rc80211_minstrel_exit(void);