Commit d9357136 authored by Adrian Bunk's avatar Adrian Bunk Committed by John W. Linville
Browse files

the scheduled rc80211-simple.c removal 



Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7524d7d6

Documentation/feature-removal-schedule.txt

+0 −10
Original line number Diff line number Diff line
@@ -230,16 +230,6 @@ Who: Jean Delvare <khali@linux-fr.org> 


---------------------------



What:	rc80211-simple rate control algorithm for mac80211

When:	2.6.26

Files:	net/mac80211/rc80211-simple.c

Why:	This algorithm was provided for reference but always exhibited bad

	responsiveness and performance and has some serious flaws. It has been

	replaced by rc80211-pid.

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



---------------------------



What (Why):

	- include/linux/netfilter_ipv4/ipt_TOS.h ipt_tos.h header files

	  (superseded by xt_TOS/xt_tos target & match)

net/mac80211/Kconfig

+0 −19
Original line number Diff line number Diff line
@@ -32,15 +32,6 @@ config MAC80211_RC_DEFAULT_PID 
	  default rate control algorithm. You should choose

	  this unless you know what you are doing.



config MAC80211_RC_DEFAULT_SIMPLE

	bool "Simple rate control algorithm"

	select MAC80211_RC_SIMPLE

	---help---

	  Select the simple rate control as the default rate

	  control algorithm. Note that this is a non-responsive,

	  dumb algorithm. You should choose the PID rate control

	  instead.



config MAC80211_RC_DEFAULT_NONE

	bool "No default algorithm"

	depends on EMBEDDED
@@ -57,7 +48,6 @@ comment "build the algorithm into mac80211." 
config MAC80211_RC_DEFAULT

	string

	default "pid" if MAC80211_RC_DEFAULT_PID

	default "simple" if MAC80211_RC_DEFAULT_SIMPLE

	default ""



config MAC80211_RC_PID
@@ -70,15 +60,6 @@ config MAC80211_RC_PID 
	  Say Y or M unless you're sure you want to use a

	  different rate control algorithm.



config MAC80211_RC_SIMPLE

	tristate "Simple rate control algorithm (DEPRECATED)"

	---help---

	  This option enables a very simple, non-responsive TX

	  rate control algorithm. This algorithm is deprecated

	  and will be removed from the kernel in the near future.

	  It has been replaced by the PID algorithm.



	  Say N unless you know what you are doing.

endmenu



config MAC80211_MESH

net/mac80211/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -44,9 +44,7 @@ mac80211-$(CONFIG_MAC80211_MESH) += \ 




# Build rate control algorithm(s)

CFLAGS_rc80211_simple.o += -DRC80211_SIMPLE_COMPILE

CFLAGS_rc80211_pid_algo.o += -DRC80211_PID_COMPILE

mac80211-$(CONFIG_MAC80211_RC_SIMPLE) += rc80211_simple.o

mac80211-$(CONFIG_MAC80211_RC_PID) += $(rc-pid-$(CONFIG_MAC80211_RC_PID))



# Modular rate algorithms are assigned to mac80211-m - make separate modules

net/mac80211/ieee80211.c

+1 −8
Original line number Diff line number Diff line
@@ -1803,13 +1803,9 @@ static int __init ieee80211_init(void) 


	BUILD_BUG_ON(sizeof(struct ieee80211_tx_packet_data) > sizeof(skb->cb));



	ret = rc80211_simple_init();

	if (ret)

		goto out;



	ret = rc80211_pid_init();

	if (ret)

		goto out_cleanup_simple;

		goto out;



	ret = ieee80211_wme_register();

	if (ret) {
@@ -1824,15 +1820,12 @@ static int __init ieee80211_init(void) 


 out_cleanup_pid:

	rc80211_pid_exit();

 out_cleanup_simple:

	rc80211_simple_exit();

 out:

	return ret;

}



static void __exit ieee80211_exit(void)

{

	rc80211_simple_exit();

	rc80211_pid_exit();



	if (mesh_allocated)

net/mac80211/ieee80211_rate.h

+0 −15
Original line number Diff line number Diff line
@@ -171,21 +171,6 @@ void rate_control_deinitialize(struct ieee80211_local *local); 




/* Rate control algorithms */

#if defined(RC80211_SIMPLE_COMPILE) || \

	(defined(CONFIG_MAC80211_RC_SIMPLE) && \

	 !defined(CONFIG_MAC80211_RC_SIMPLE_MODULE))

extern int rc80211_simple_init(void);

extern void rc80211_simple_exit(void);

#else

static inline int rc80211_simple_init(void)

{

	return 0;

}

static inline void rc80211_simple_exit(void)

{

}

#endif



#if defined(RC80211_PID_COMPILE) || \

	(defined(CONFIG_MAC80211_RC_PID) && \

	 !defined(CONFIG_MAC80211_RC_PID_MODULE))