Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3c62f75aac7348ee262b1295cfcfeb3473f76815

Authored by David Kimdon
Committed by David S. Miller
1 parent 3dfbcc411e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PKT_SCHED]: Make sch_fifo.o available when CONFIG_NET_SCHED is not set. 

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 <david.kimdon@devicescape.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 6 additions and 1 deletions Side-by-side Diff

... ... @@ -6,6 +6,7 @@
6 6  
7 7 config NET_SCHED
8 8 bool "QoS and/or fair queueing"
  9 + select NET_SCH_FIFO
9 10 ---help---
10 11 When the kernel has several packets to send out over a network
11 12 device, it has to decide which ones to send first, which ones to
... ... @@ -39,6 +40,9 @@
39 40  
40 41 The available schedulers are listed in the following questions; you
41 42 can say Y to as many as you like. If unsure, say N now.
  43 +
  44 +config NET_SCH_FIFO
  45 + bool
42 46  
43 47 if NET_SCHED
44 48  
... ... @@ -4,7 +4,7 @@
4 4  
5 5 obj-y := sch_generic.o
6 6  
7   -obj-$(CONFIG_NET_SCHED) += sch_api.o sch_fifo.o sch_blackhole.o
  7 +obj-$(CONFIG_NET_SCHED) += sch_api.o sch_blackhole.o
8 8 obj-$(CONFIG_NET_CLS) += cls_api.o
9 9 obj-$(CONFIG_NET_CLS_ACT) += act_api.o
10 10 obj-$(CONFIG_NET_ACT_POLICE) += act_police.o
... ... @@ -14,6 +14,7 @@
14 14 obj-$(CONFIG_NET_ACT_IPT) += act_ipt.o
15 15 obj-$(CONFIG_NET_ACT_PEDIT) += act_pedit.o
16 16 obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o
  17 +obj-$(CONFIG_NET_SCH_FIFO) += sch_fifo.o
17 18 obj-$(CONFIG_NET_SCH_CBQ) += sch_cbq.o
18 19 obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o
19 20 obj-$(CONFIG_NET_SCH_HPFQ) += sch_hpfq.o