diff options
-rw-r--r-- | net/sched/Makefile | 14 | ||||
-rw-r--r-- | net/sched/act_api.c | 2 | ||||
-rw-r--r-- | net/sched/act_gact.c (renamed from net/sched/gact.c) | 0 | ||||
-rw-r--r-- | net/sched/act_ipt.c (renamed from net/sched/ipt.c) | 0 | ||||
-rw-r--r-- | net/sched/act_mirred.c (renamed from net/sched/mirred.c) | 0 | ||||
-rw-r--r-- | net/sched/act_pedit.c (renamed from net/sched/pedit.c) | 0 | ||||
-rw-r--r-- | net/sched/act_police.c (renamed from net/sched/police.c) | 0 | ||||
-rw-r--r-- | net/sched/act_simple.c (renamed from net/sched/simple.c) | 0 |
8 files changed, 8 insertions, 8 deletions
diff --git a/net/sched/Makefile b/net/sched/Makefile index e48d0d456b3e..0f06aec66094 100644 --- a/net/sched/Makefile +++ b/net/sched/Makefile | |||
@@ -7,13 +7,13 @@ obj-y := sch_generic.o | |||
7 | obj-$(CONFIG_NET_SCHED) += sch_api.o sch_fifo.o sch_blackhole.o | 7 | obj-$(CONFIG_NET_SCHED) += sch_api.o sch_fifo.o sch_blackhole.o |
8 | obj-$(CONFIG_NET_CLS) += cls_api.o | 8 | obj-$(CONFIG_NET_CLS) += cls_api.o |
9 | obj-$(CONFIG_NET_CLS_ACT) += act_api.o | 9 | obj-$(CONFIG_NET_CLS_ACT) += act_api.o |
10 | obj-$(CONFIG_NET_ACT_POLICE) += police.o | 10 | obj-$(CONFIG_NET_ACT_POLICE) += act_police.o |
11 | obj-$(CONFIG_NET_CLS_POLICE) += police.o | 11 | obj-$(CONFIG_NET_CLS_POLICE) += act_police.o |
12 | obj-$(CONFIG_NET_ACT_GACT) += gact.o | 12 | obj-$(CONFIG_NET_ACT_GACT) += act_gact.o |
13 | obj-$(CONFIG_NET_ACT_MIRRED) += mirred.o | 13 | obj-$(CONFIG_NET_ACT_MIRRED) += act_mirred.o |
14 | obj-$(CONFIG_NET_ACT_IPT) += ipt.o | 14 | obj-$(CONFIG_NET_ACT_IPT) += act_ipt.o |
15 | obj-$(CONFIG_NET_ACT_PEDIT) += pedit.o | 15 | obj-$(CONFIG_NET_ACT_PEDIT) += act_pedit.o |
16 | obj-$(CONFIG_NET_ACT_SIMP) += simple.o | 16 | obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o |
17 | obj-$(CONFIG_NET_SCH_CBQ) += sch_cbq.o | 17 | obj-$(CONFIG_NET_SCH_CBQ) += sch_cbq.o |
18 | obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o | 18 | obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o |
19 | obj-$(CONFIG_NET_SCH_HPFQ) += sch_hpfq.o | 19 | obj-$(CONFIG_NET_SCH_HPFQ) += sch_hpfq.o |
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index bd651a408817..792ce59940ec 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c | |||
@@ -290,7 +290,7 @@ struct tc_action *tcf_action_init_1(struct rtattr *rta, struct rtattr *est, | |||
290 | if (a_o == NULL) { | 290 | if (a_o == NULL) { |
291 | #ifdef CONFIG_KMOD | 291 | #ifdef CONFIG_KMOD |
292 | rtnl_unlock(); | 292 | rtnl_unlock(); |
293 | request_module(act_name); | 293 | request_module("act_%s", act_name); |
294 | rtnl_lock(); | 294 | rtnl_lock(); |
295 | 295 | ||
296 | a_o = tc_lookup_action_n(act_name); | 296 | a_o = tc_lookup_action_n(act_name); |
diff --git a/net/sched/gact.c b/net/sched/act_gact.c index a1e68f78dcc2..a1e68f78dcc2 100644 --- a/net/sched/gact.c +++ b/net/sched/act_gact.c | |||
diff --git a/net/sched/ipt.c b/net/sched/act_ipt.c index b5001939b74b..b5001939b74b 100644 --- a/net/sched/ipt.c +++ b/net/sched/act_ipt.c | |||
diff --git a/net/sched/mirred.c b/net/sched/act_mirred.c index 4fcccbd50885..4fcccbd50885 100644 --- a/net/sched/mirred.c +++ b/net/sched/act_mirred.c | |||
diff --git a/net/sched/pedit.c b/net/sched/act_pedit.c index 1742a68e0122..1742a68e0122 100644 --- a/net/sched/pedit.c +++ b/net/sched/act_pedit.c | |||
diff --git a/net/sched/police.c b/net/sched/act_police.c index fa877f8f652c..fa877f8f652c 100644 --- a/net/sched/police.c +++ b/net/sched/act_police.c | |||
diff --git a/net/sched/simple.c b/net/sched/act_simple.c index e5f2e1f431e2..e5f2e1f431e2 100644 --- a/net/sched/simple.c +++ b/net/sched/act_simple.c | |||