[PATCH 6/6][PKT_SCHED]: Prefix tc actions with act_

[Patrick McHardy]

This patch prefixes the tc actions with act_. I didn't include
the actual renames in the patch because I think it makes git
loose its history, please execute these commands when applying
the patch:

git-rename net/sched/mirred.c net/sched/act_mirred.c
git-rename net/sched/ipt.c net/sched/act_ipt.c
git-rename net/sched/gact.c net/sched/act_gact.c
git-rename net/sched/police.c net/sched/act_police.c
git-rename net/sched/simple.c net/sched/act_simple.c
git-rename net/sched/pedit.c net/sched/act_pedit.c

Thanks.
[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 <[EMAIL PROTECTED]>

---
commit 9162c4b1cddbc7a67e16641c249b0aac95a2194a
tree db22e79bd87036655398574e93a9c38434182704
parent 1acf07902f3ae56bb78ce68b619e252d655781a4
author Patrick McHardy <[EMAIL PROTECTED]> Sun, 08 Jan 2006 00:04:55 +0100
committer Patrick McHardy <[EMAIL PROTECTED]> Sun, 08 Jan 2006 00:04:55 +0100

 net/sched/Makefile  |   14 +++---
 net/sched/act_api.c |2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net/sched/Makefile b/net/sched/Makefile
index e48d0d4..0f06aec 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 bd651a4..792ce59 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -290,7 +290,7 @@ struct tc_action *tcf_action_init_1(stru
 	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);

Re: [PATCH 6/6][PKT_SCHED]: Prefix tc actions with act_

[David S. Miller]

From: Patrick McHardy <[EMAIL PROTECTED]>
Date: Sun, 08 Jan 2006 00:38:03 +0100

> This patch prefixes the tc actions with act_. I didn't include
> the actual renames in the patch because I think it makes git
> loose its history, please execute these commands when applying
> the patch:

Note that when you generate patches using GIT, it emits some header
line information in the diff describing moves, deletes, and stuff like
that.  So, when you feed such a patch back into the GIT patch
application programs it knows exactly what to do.

You don't have to regenerate your changes or anything like that,
I'm just letting you know for the future. :-)
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 6/6][PKT_SCHED]: Prefix tc actions with act_

[David S. Miller]

From: Patrick McHardy <[EMAIL PROTECTED]>
Date: Sun, 08 Jan 2006 00:38:03 +0100

> [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 <[EMAIL PROTECTED]>

Applied, with the appropriate rename commands.

Thanks.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html