Commit 8f047480 authored by Roman Mashak's avatar Roman Mashak Committed by David S. Miller

net sched actions: change IFE modules alias names

Make style of module alias name consistent with other subsystems in kernel,
for example net devices.

Fixes: 084e2f65 ("Support to encoding decoding skb mark on IFE action")
Fixes: 200e10f4 ("Support to encoding decoding skb prio on IFE action")
Fixes: 408fbc22 ("net sched ife action: Introduce skb tcindex metadata encap decap")
Signed-off-by: default avatarRoman Mashak <mrv@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47f25464
...@@ -40,7 +40,7 @@ struct tcf_meta_ops { ...@@ -40,7 +40,7 @@ struct tcf_meta_ops {
struct module *owner; struct module *owner;
}; };
#define MODULE_ALIAS_IFE_META(metan) MODULE_ALIAS("ifemeta" __stringify_1(metan)) #define MODULE_ALIAS_IFE_META(metan) MODULE_ALIAS("ife-meta-" metan)
int ife_get_meta_u32(struct sk_buff *skb, struct tcf_meta_info *mi); int ife_get_meta_u32(struct sk_buff *skb, struct tcf_meta_info *mi);
int ife_get_meta_u16(struct sk_buff *skb, struct tcf_meta_info *mi); int ife_get_meta_u16(struct sk_buff *skb, struct tcf_meta_info *mi);
......
...@@ -263,7 +263,7 @@ static int load_metaops_and_vet(struct tcf_ife_info *ife, u32 metaid, ...@@ -263,7 +263,7 @@ static int load_metaops_and_vet(struct tcf_ife_info *ife, u32 metaid,
if (exists) if (exists)
spin_unlock_bh(&ife->tcf_lock); spin_unlock_bh(&ife->tcf_lock);
rtnl_unlock(); rtnl_unlock();
request_module("ifemeta%u", metaid); request_module("ife-meta-%u", metaid);
rtnl_lock(); rtnl_lock();
if (exists) if (exists)
spin_lock_bh(&ife->tcf_lock); spin_lock_bh(&ife->tcf_lock);
......
...@@ -76,4 +76,4 @@ module_exit(ifemark_cleanup_module); ...@@ -76,4 +76,4 @@ module_exit(ifemark_cleanup_module);
MODULE_AUTHOR("Jamal Hadi Salim(2015)"); MODULE_AUTHOR("Jamal Hadi Salim(2015)");
MODULE_DESCRIPTION("Inter-FE skb mark metadata module"); MODULE_DESCRIPTION("Inter-FE skb mark metadata module");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_IFE_META(IFE_META_SKBMARK); MODULE_ALIAS_IFE_META("skbmark");
...@@ -73,4 +73,4 @@ module_exit(ifeprio_cleanup_module); ...@@ -73,4 +73,4 @@ module_exit(ifeprio_cleanup_module);
MODULE_AUTHOR("Jamal Hadi Salim(2015)"); MODULE_AUTHOR("Jamal Hadi Salim(2015)");
MODULE_DESCRIPTION("Inter-FE skb prio metadata action"); MODULE_DESCRIPTION("Inter-FE skb prio metadata action");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_IFE_META(IFE_META_PRIO); MODULE_ALIAS_IFE_META("skbprio");
...@@ -76,4 +76,4 @@ module_exit(ifetc_index_cleanup_module); ...@@ -76,4 +76,4 @@ module_exit(ifetc_index_cleanup_module);
MODULE_AUTHOR("Jamal Hadi Salim(2016)"); MODULE_AUTHOR("Jamal Hadi Salim(2016)");
MODULE_DESCRIPTION("Inter-FE skb tc_index metadata module"); MODULE_DESCRIPTION("Inter-FE skb tc_index metadata module");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_IFE_META(IFE_META_SKBTCINDEX); MODULE_ALIAS_IFE_META("tcindex");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment