From 47b7d68bac9420b2b11c1d9a3e14653e53b15f85 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Sun, 8 Jan 2006 22:22:14 -0800 Subject: [PATCH] --- yaml --- r: 17439 b: refs/heads/master c: 4bba3925924148c24fb0c7636a04ad69a6a56b84 h: refs/heads/master i: 17437: 13fceadbbe8d6807d9154f03020fd95b18d868fc 17435: 7abcb1b23625b2e86c0d86f6f33cd4aa7805a034 17431: 7a17b47c81b54319f136b808112b62e8dbb66b71 17423: d6d87aef8fa8f5fd094dd07bce1d9698c91e6ab3 17407: bd354ad2ecf8084b02b062002373b13966f0d560 v: v3 --- [refs] | 2 +- trunk/net/sched/Makefile | 14 +++++++------- trunk/net/sched/act_api.c | 2 +- trunk/net/sched/{gact.c => act_gact.c} | 0 trunk/net/sched/{ipt.c => act_ipt.c} | 0 trunk/net/sched/{mirred.c => act_mirred.c} | 0 trunk/net/sched/{pedit.c => act_pedit.c} | 0 trunk/net/sched/{police.c => act_police.c} | 0 trunk/net/sched/{simple.c => act_simple.c} | 0 9 files changed, 9 insertions(+), 9 deletions(-) rename trunk/net/sched/{gact.c => act_gact.c} (100%) rename trunk/net/sched/{ipt.c => act_ipt.c} (100%) rename trunk/net/sched/{mirred.c => act_mirred.c} (100%) rename trunk/net/sched/{pedit.c => act_pedit.c} (100%) rename trunk/net/sched/{police.c => act_police.c} (100%) rename trunk/net/sched/{simple.c => act_simple.c} (100%) diff --git a/[refs] b/[refs] index 36fa2e3a12cc..47596afcfd64 100644 --- 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 index e48d0d456b3e..0f06aec66094 100644 --- 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 index bd651a408817..792ce59940ec 100644 --- 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 b/trunk/net/sched/act_gact.c similarity index 100% rename from trunk/net/sched/gact.c rename to trunk/net/sched/act_gact.c diff --git a/trunk/net/sched/ipt.c b/trunk/net/sched/act_ipt.c similarity index 100% rename from trunk/net/sched/ipt.c rename to trunk/net/sched/act_ipt.c diff --git a/trunk/net/sched/mirred.c b/trunk/net/sched/act_mirred.c similarity index 100% rename from trunk/net/sched/mirred.c rename to trunk/net/sched/act_mirred.c diff --git a/trunk/net/sched/pedit.c b/trunk/net/sched/act_pedit.c similarity index 100% rename from trunk/net/sched/pedit.c rename to trunk/net/sched/act_pedit.c diff --git a/trunk/net/sched/police.c b/trunk/net/sched/act_police.c similarity index 100% rename from trunk/net/sched/police.c rename to trunk/net/sched/act_police.c diff --git a/trunk/net/sched/simple.c b/trunk/net/sched/act_simple.c similarity index 100% rename from trunk/net/sched/simple.c rename to trunk/net/sched/act_simple.c