瀏覽代碼

[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>
Patrick McHardy 19 年之前
父節點
當前提交
4bba392592
共有 8 個文件被更改,包括 8 次插入8 次删除
  1. 7 7
      net/sched/Makefile
  2. 1 1
      net/sched/act_api.c
  3. 0 0
      net/sched/act_gact.c
  4. 0 0
      net/sched/act_ipt.c
  5. 0 0
      net/sched/act_mirred.c
  6. 0 0
      net/sched/act_pedit.c
  7. 0 0
      net/sched/act_police.c
  8. 0 0
      net/sched/act_simple.c

+ 7 - 7
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

+ 1 - 1
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);

+ 0 - 0
net/sched/gact.c → net/sched/act_gact.c


+ 0 - 0
net/sched/ipt.c → net/sched/act_ipt.c


+ 0 - 0
net/sched/mirred.c → net/sched/act_mirred.c


+ 0 - 0
net/sched/pedit.c → net/sched/act_pedit.c


+ 0 - 0
net/sched/police.c → net/sched/act_police.c


+ 0 - 0
net/sched/simple.c → net/sched/act_simple.c