Skip to contentSkip to conversation

make sch_fifo.o available when CONFIG_NET_SCHED is not set

PATCH Applied David Kimdon 3 participants 4 messages Oct 31, 2006 – Nov 10, 2006

Subsystems (3)
Networking Network drivers Traffic control (tc)
lore
Share & tools
lore

David Kimdon

author
#0 lore raw

PATCH 1/1 make sch_fifo.o available when CONFIG_NET_SCHED is not set

You may see this discussion for more info:
http://marc.theaimsgroup.com/?t=116181395100002&r=1&w=2

----
Based on a patch by Patrick McHardy.

Add a new option, NET_SCH_FIFO, which provides a simple fifo qdisc without requiring CONFIG_NET_SCHED.

The d80211 stack needs a generic fifo qdisc for WME. At present it uses net/d80211/fifo_qdisc.c which is functionally equivalent to sch_fifo.c. This patch will allow the d80211 stack to remove net/d80211/fifo_qdisc.c and use sch_fifo.c instead.

Signed-off-by David Kimdon <[email protected]>
net/sched/Kconfig +10 -0
Index: wireless-dev/net/sched/Kconfig
===================================================================
@@ -6,6 +6,7 @@ menu "QoS and/or fair queueing"
 
 config NET_SCHED
 	bool "QoS and/or fair queueing"
+	select NET_SCH_FIFO
 	---help---
 	  When the kernel has several packets to send out over a network
 	  device, it has to decide which ones to send first, which ones to

@@ -40,6 +41,15 @@ config NET_SCHED
 	  The available schedulers are listed in the following questions; you
 	  can say Y to as many as you like. If unsure, say N now.
 
+config NET_SCH_FIFO
+	tristate "Simple Fifo Qdisc (PFIFO, BFIFO)"
+	---help---
+	  Say Y here if you want to use the simple pfifo or bfifo
+	  packet scheduling algorithms.
+
+	  To compile this code as a module, choose M here: the
+	  module will be called sch_fifo.
+
 if NET_SCHED
 
 choice
net/sched/Makefile +2 -1
Index: wireless-dev/net/sched/Makefile
===================================================================
@@ -4,7 +4,7 @@
 
 obj-y	:= sch_generic.o
 
-obj-$(CONFIG_NET_SCHED)		+= sch_api.o sch_fifo.o sch_blackhole.o
+obj-$(CONFIG_NET_SCHED)		+= sch_api.o sch_blackhole.o
 obj-$(CONFIG_NET_CLS)		+= cls_api.o
 obj-$(CONFIG_NET_CLS_ACT)	+= act_api.o
 obj-$(CONFIG_NET_ACT_POLICE)	+= act_police.o

@@ -14,6 +14,7 @@ obj-$(CONFIG_NET_ACT_MIRRED)	+= act_mirr
 obj-$(CONFIG_NET_ACT_IPT)	+= act_ipt.o
 obj-$(CONFIG_NET_ACT_PEDIT)	+= act_pedit.o
 obj-$(CONFIG_NET_ACT_SIMP)	+= act_simple.o
+obj-$(CONFIG_NET_SCH_FIFO)	+= sch_fifo.o
 obj-$(CONFIG_NET_SCH_CBQ)	+= sch_cbq.o
 obj-$(CONFIG_NET_SCH_HTB)	+= sch_htb.o
 obj-$(CONFIG_NET_SCH_HPFQ)	+= sch_hpfq.o

--

#1 lore raw

* David Kimdon <[email protected]> 2006-10-31 08:53

Quoted 6 lines

You may see this discussion for more info:
http://marc.theaimsgroup.com/?t=116181395100002&r=1&w=2

----
Based on a patch by Patrick McHardy.

Quoted 7 lines

Add a new option, NET_SCH_FIFO, which provides a simple fifo qdisc without requiring CONFIG_NET_SCHED.

The d80211 stack needs a generic fifo qdisc for WME. At present it uses net/d80211/fifo_qdisc.c which is functionally equivalent to sch_fifo.c. This patch will allow the d80211 stack to remove net/d80211/fifo_qdisc.c and use sch_fifo.c instead.

I think NET_SCH_FIFO doesn't need a help text, should be invisible to the user. Just select it from NET_SCHED and d80211.

author
#2 lore raw
Quoted 2 lines · Thomas Graf

I think NET_SCH_FIFO doesn't need a help text, should be invisible to the user. Just select it from NET_SCHED and d80211.

sure, here is a new one:

----
Based on patch by Patrick McHardy.

Add a new option, NET_SCH_FIFO, which provides a simple fifo qdisc without requiring CONFIG_NET_SCHED.

The d80211 stack needs a generic fifo qdisc for WME. At present it uses net/d80211/fifo_qdisc.c which is functionally equivalent to sch_fifo.c. This patch will allow the d80211 stack to remove net/d80211/fifo_qdisc.c and use sch_fifo.c instead.

Signed-off-by David Kimdon <[email protected]>
net/sched/Kconfig +4 -0
Index: wireless-dev/net/sched/Kconfig
===================================================================
@@ -6,6 +6,7 @@ menu "QoS and/or fair queueing"
 
 config NET_SCHED
 	bool "QoS and/or fair queueing"
+	select NET_SCH_FIFO
 	---help---
 	  When the kernel has several packets to send out over a network
 	  device, it has to decide which ones to send first, which ones to

@@ -40,6 +41,9 @@ config NET_SCHED
 	  The available schedulers are listed in the following questions; you
 	  can say Y to as many as you like. If unsure, say N now.
 
+config NET_SCH_FIFO
+	bool
+
 if NET_SCHED
 
 choice
net/sched/Makefile +2 -1
Index: wireless-dev/net/sched/Makefile
===================================================================
@@ -4,7 +4,7 @@
 
 obj-y	:= sch_generic.o
 
-obj-$(CONFIG_NET_SCHED)		+= sch_api.o sch_fifo.o sch_blackhole.o
+obj-$(CONFIG_NET_SCHED)		+= sch_api.o sch_blackhole.o
 obj-$(CONFIG_NET_CLS)		+= cls_api.o
 obj-$(CONFIG_NET_CLS_ACT)	+= act_api.o
 obj-$(CONFIG_NET_ACT_POLICE)	+= act_police.o

@@ -14,6 +14,7 @@ obj-$(CONFIG_NET_ACT_MIRRED)	+= act_mirr
 obj-$(CONFIG_NET_ACT_IPT)	+= act_ipt.o
 obj-$(CONFIG_NET_ACT_PEDIT)	+= act_pedit.o
 obj-$(CONFIG_NET_ACT_SIMP)	+= act_simple.o
+obj-$(CONFIG_NET_SCH_FIFO)	+= sch_fifo.o
 obj-$(CONFIG_NET_SCH_CBQ)	+= sch_cbq.o
 obj-$(CONFIG_NET_SCH_HTB)	+= sch_htb.o
 obj-$(CONFIG_NET_SCH_HPFQ)	+= sch_hpfq.o
maintainer Applied
#3 lore raw

From: David Kimdon <[email protected]>
Date: Wed, 8 Nov 2006 06:06:18 -0800

Quoted 11 lines

Based on patch by Patrick McHardy.

Add a new option, NET_SCH_FIFO, which provides a simple fifo qdisc without requiring CONFIG_NET_SCHED.

The d80211 stack needs a generic fifo qdisc for WME. At present it uses net/d80211/fifo_qdisc.c which is functionally equivalent to sch_fifo.c. This patch will allow the d80211 stack to remove net/d80211/fifo_qdisc.c and use sch_fifo.c instead.

Signed-off-by David Kimdon <[email protected]>

Applied to net-2.6.20, thanks David.