---

yaml --- r: 17439 b: refs/heads/master c: 4bba392 h: refs/heads/master i: 17437: 13fcead 17435: 7abcb1b 17431: 7a17b47 17423: d6d87ae 17407: bd354ad v: v3
git-mirror · Jan 9, 2006 · 47b7d68 · 47b7d68
1 parent 3a45819
commit 47b7d68
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 541673c859c0d71dedaaea1c148dfe3ccccc9422
+refs/heads/master: 4bba3925924148c24fb0c7636a04ad69a6a56b84
diff --git a/trunk/net/sched/Makefile b/trunk/net/sched/Makefile
@@ -7,13 +7,13 @@ obj-y	:= sch_generic.o
 obj-$(CONFIG_NET_SCHED)		+= sch_api.o sch_fifo.o sch_blackhole.o
 obj-$(CONFIG_NET_CLS)		+= cls_api.o
 obj-$(CONFIG_NET_CLS_ACT)	+= act_api.o
-obj-$(CONFIG_NET_ACT_POLICE)	+= police.o
-obj-$(CONFIG_NET_CLS_POLICE)	+= police.o
-obj-$(CONFIG_NET_ACT_GACT)	+= gact.o
-obj-$(CONFIG_NET_ACT_MIRRED)	+= mirred.o
-obj-$(CONFIG_NET_ACT_IPT)	+= ipt.o
-obj-$(CONFIG_NET_ACT_PEDIT)	+= pedit.o
-obj-$(CONFIG_NET_ACT_SIMP)	+= simple.o
+obj-$(CONFIG_NET_ACT_POLICE)	+= act_police.o
+obj-$(CONFIG_NET_CLS_POLICE)	+= act_police.o
+obj-$(CONFIG_NET_ACT_GACT)	+= act_gact.o
+obj-$(CONFIG_NET_ACT_MIRRED)	+= act_mirred.o
+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_CBQ)	+= sch_cbq.o
 obj-$(CONFIG_NET_SCH_HTB)	+= sch_htb.o
 obj-$(CONFIG_NET_SCH_HPFQ)	+= sch_hpfq.o

diff --git a/trunk/net/sched/act_api.c b/trunk/net/sched/act_api.c
@@ -290,7 +290,7 @@ struct tc_action *tcf_action_init_1(struct rtattr *rta, struct rtattr *est,
 	if (a_o == NULL) {
 #ifdef CONFIG_KMOD
 		rtnl_unlock();
-		request_module(act_name);
+		request_module("act_%s", act_name);
 		rtnl_lock();
 
 		a_o = tc_lookup_action_n(act_name);

diff --git a/trunk/net/sched/gact.c → trunk/net/sched/act_gact.c b/trunk/net/sched/gact.c → trunk/net/sched/act_gact.c
diff --git a/trunk/net/sched/ipt.c → trunk/net/sched/act_ipt.c b/trunk/net/sched/ipt.c → trunk/net/sched/act_ipt.c
diff --git a/trunk/net/sched/mirred.c → trunk/net/sched/act_mirred.c b/trunk/net/sched/mirred.c → trunk/net/sched/act_mirred.c
diff --git a/trunk/net/sched/pedit.c → trunk/net/sched/act_pedit.c b/trunk/net/sched/pedit.c → trunk/net/sched/act_pedit.c
diff --git a/trunk/net/sched/police.c → trunk/net/sched/act_police.c b/trunk/net/sched/police.c → trunk/net/sched/act_police.c
diff --git a/trunk/net/sched/simple.c → trunk/net/sched/act_simple.c b/trunk/net/sched/simple.c → trunk/net/sched/act_simple.c