@@ -200,6 +200,7 @@ int tcf_idr_release(struct tc_action *a, bool bind);
int tcf_register_action(struct tc_action_ops *a, struct pernet_operations *ops);
int tcf_unregister_action(struct tc_action_ops *a,
struct pernet_operations *ops);
+#define MODULE_ALIAS_TCA(kind) MODULE_ALIAS("tca-" __stringify(kind))
int tcf_action_destroy(struct tc_action *actions[], int bind);
int tcf_action_exec(struct sk_buff *skb, struct tc_action **actions,
int nr_actions, struct tcf_result *res);
@@ -1331,7 +1331,7 @@ struct tc_action_ops *tc_action_load_ops(struct nlattr *nla, bool police,
#ifdef CONFIG_MODULES
if (rtnl_held)
rtnl_unlock();
- request_module("act_%s", act_name);
+ request_module("tca-%s", act_name);
if (rtnl_held)
rtnl_lock();
@@ -401,6 +401,7 @@ static struct tc_action_ops act_bpf_ops __read_mostly = {
.init = tcf_bpf_init,
.size = sizeof(struct tcf_bpf),
};
+MODULE_ALIAS_TCA("bpf");
static __net_init int bpf_init_net(struct net *net)
{
@@ -242,6 +242,7 @@ static struct tc_action_ops act_connmark_ops = {
.cleanup = tcf_connmark_cleanup,
.size = sizeof(struct tcf_connmark_info),
};
+MODULE_ALIAS_TCA("connmark");
static __net_init int connmark_init_net(struct net *net)
{
@@ -709,6 +709,7 @@ static struct tc_action_ops act_csum_ops = {
.offload_act_setup = tcf_csum_offload_act_setup,
.size = sizeof(struct tcf_csum),
};
+MODULE_ALIAS_TCA("csum");
static __net_init int csum_init_net(struct net *net)
{
@@ -1578,6 +1578,7 @@ static struct tc_action_ops act_ct_ops = {
.offload_act_setup = tcf_ct_offload_act_setup,
.size = sizeof(struct tcf_ct),
};
+MODULE_ALIAS_TCA("ct");
static __net_init int ct_init_net(struct net *net)
{
@@ -363,6 +363,7 @@ static struct tc_action_ops act_ctinfo_ops = {
.cleanup= tcf_ctinfo_cleanup,
.size = sizeof(struct tcf_ctinfo),
};
+MODULE_ALIAS_TCA("ctinfo");
static __net_init int ctinfo_init_net(struct net *net)
{
@@ -296,6 +296,7 @@ static struct tc_action_ops act_gact_ops = {
.offload_act_setup = tcf_gact_offload_act_setup,
.size = sizeof(struct tcf_gact),
};
+MODULE_ALIAS_TCA("gact");
static __net_init int gact_init_net(struct net *net)
{
@@ -645,6 +645,7 @@ static struct tc_action_ops act_gate_ops = {
.offload_act_setup = tcf_gate_offload_act_setup,
.size = sizeof(struct tcf_gate),
};
+MODULE_ALIAS_TCA("gate");
static __net_init int gate_init_net(struct net *net)
{
@@ -889,6 +889,7 @@ static struct tc_action_ops act_ife_ops = {
.init = tcf_ife_init,
.size = sizeof(struct tcf_ife_info),
};
+MODULE_ALIAS_TCA("ife");
static __net_init int ife_init_net(struct net *net)
{
@@ -381,6 +381,7 @@ static struct tc_action_ops act_ipt_ops = {
.init = tcf_ipt_init,
.size = sizeof(struct tcf_ipt),
};
+MODULE_ALIAS_TCA("ipt");
static __net_init int ipt_init_net(struct net *net)
{
@@ -411,6 +412,7 @@ static struct tc_action_ops act_xt_ops = {
.init = tcf_xt_init,
.size = sizeof(struct tcf_ipt),
};
+MODULE_ALIAS_TCA("xt");
static __net_init int xt_init_net(struct net *net)
{
@@ -505,6 +505,7 @@ static struct tc_action_ops act_mirred_ops = {
.size = sizeof(struct tcf_mirred),
.get_dev = tcf_mirred_get_dev,
};
+MODULE_ALIAS_TCA("mirred");
static __net_init int mirred_init_net(struct net *net)
{
@@ -452,6 +452,7 @@ static struct tc_action_ops act_mpls_ops = {
.offload_act_setup = tcf_mpls_offload_act_setup,
.size = sizeof(struct tcf_mpls),
};
+MODULE_ALIAS_TCA("mpls");
static __net_init int mpls_init_net(struct net *net)
{
@@ -324,6 +324,7 @@ static struct tc_action_ops act_nat_ops = {
.cleanup = tcf_nat_cleanup,
.size = sizeof(struct tcf_nat),
};
+MODULE_ALIAS_TCA("nat");
static __net_init int nat_init_net(struct net *net)
{
@@ -620,6 +620,7 @@ static struct tc_action_ops act_pedit_ops = {
.offload_act_setup = tcf_pedit_offload_act_setup,
.size = sizeof(struct tcf_pedit),
};
+MODULE_ALIAS_TCA("pedit");
static __net_init int pedit_init_net(struct net *net)
{
@@ -502,6 +502,7 @@ static struct tc_action_ops act_police_ops = {
.offload_act_setup = tcf_police_offload_act_setup,
.size = sizeof(struct tcf_police),
};
+MODULE_ALIAS_TCA("police");
static __net_init int police_init_net(struct net *net)
{
@@ -316,6 +316,7 @@ static struct tc_action_ops act_sample_ops = {
.offload_act_setup = tcf_sample_offload_act_setup,
.size = sizeof(struct tcf_sample),
};
+MODULE_ALIAS_TCA("sample");
static __net_init int sample_init_net(struct net *net)
{
@@ -209,6 +209,7 @@ static struct tc_action_ops act_simp_ops = {
.init = tcf_simp_init,
.size = sizeof(struct tcf_defact),
};
+MODULE_ALIAS_TCA("simple");
static __net_init int simp_init_net(struct net *net)
{
@@ -426,6 +426,7 @@ static struct tc_action_ops act_skbedit_ops = {
.offload_act_setup = tcf_skbedit_offload_act_setup,
.size = sizeof(struct tcf_skbedit),
};
+MODULE_ALIAS_TCA("skbedit");
static __net_init int skbedit_init_net(struct net *net)
{
@@ -287,6 +287,7 @@ static struct tc_action_ops act_skbmod_ops = {
.cleanup = tcf_skbmod_cleanup,
.size = sizeof(struct tcf_skbmod),
};
+MODULE_ALIAS_TCA("skbmod");
static __net_init int skbmod_init_net(struct net *net)
{
@@ -842,6 +842,7 @@ static struct tc_action_ops act_tunnel_key_ops = {
.offload_act_setup = tcf_tunnel_key_offload_act_setup,
.size = sizeof(struct tcf_tunnel_key),
};
+MODULE_ALIAS_TCA("tunnel_key");
static __net_init int tunnel_key_init_net(struct net *net)
{
@@ -427,6 +427,7 @@ static struct tc_action_ops act_vlan_ops = {
.offload_act_setup = tcf_vlan_offload_act_setup,
.size = sizeof(struct tcf_vlan),
};
+MODULE_ALIAS_TCA("vlan");
static __net_init int vlan_init_net(struct net *net)
{