From 4bba3925924148c24fb0c7636a04ad69a6a56b84 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Sun, 8 Jan 2006 22:22:14 -0800
Subject: [PATCH] [PKT_SCHED]: Prefix tc actions with act_
Clean up the net/sched directory a bit by prefix all actions with act_.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/sched/Makefile | 14 +++++++-------
net/sched/act_api.c | 2 +-
net/sched/{gact.c => act_gact.c} | 0
net/sched/{ipt.c => act_ipt.c} | 0
net/sched/{mirred.c => act_mirred.c} | 0
net/sched/{pedit.c => act_pedit.c} | 0
net/sched/{police.c => act_police.c} | 0
net/sched/{simple.c => act_simple.c} | 0
8 files changed, 8 insertions(+), 8 deletions(-)
rename net/sched/{gact.c => act_gact.c} (100%)
rename net/sched/{ipt.c => act_ipt.c} (100%)
rename net/sched/{mirred.c => act_mirred.c} (100%)
rename net/sched/{pedit.c => act_pedit.c} (100%)
rename net/sched/{police.c => act_police.c} (100%)
rename net/sched/{simple.c => act_simple.c} (100%)
diff --git a/net/sched/Makefile b/net/sched/Makefile
index e48d0d456b3eb..0f06aec660940 100644
--- a/net/sched/Makefile
+++ b/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/net/sched/act_api.c b/net/sched/act_api.c
index bd651a4088171..792ce59940ecb 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,
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/net/sched/gact.c b/net/sched/act_gact.c
similarity index 100%
rename from net/sched/gact.c
rename to net/sched/act_gact.c
diff --git a/net/sched/ipt.c b/net/sched/act_ipt.c
similarity index 100%
rename from net/sched/ipt.c
rename to net/sched/act_ipt.c
diff --git a/net/sched/mirred.c b/net/sched/act_mirred.c
similarity index 100%
rename from net/sched/mirred.c
rename to net/sched/act_mirred.c
diff --git a/net/sched/pedit.c b/net/sched/act_pedit.c
similarity index 100%
rename from net/sched/pedit.c
rename to net/sched/act_pedit.c
diff --git a/net/sched/police.c b/net/sched/act_police.c
similarity index 100%
rename from net/sched/police.c
rename to net/sched/act_police.c
diff --git a/net/sched/simple.c b/net/sched/act_simple.c
similarity index 100%
rename from net/sched/simple.c
rename to net/sched/act_simple.c
--
2.30.2