/* * net/sched/act_meta_mark.c IFE skb->mark metadata module * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * * copyright Jamal Hadi Salim (2015) * */ #include #include #include #include #include #include #include #include #include #include #include #include #include static int skbmark_encode(struct sk_buff *skb, void *skbdata, struct tcf_meta_info *e) { u32 ifemark = skb->mark; return ife_encode_meta_u32(ifemark, skbdata, e); } static int skbmark_decode(struct sk_buff *skb, void *data, u16 len) { u32 ifemark = *(u32 *)data; skb->mark = ntohl(ifemark); return 0; } static int skbmark_check(struct sk_buff *skb, struct tcf_meta_info *e) { return ife_check_meta_u32(skb->mark, e); } static struct tcf_meta_ops ife_skbmark_ops = { .metaid = IFE_META_SKBMARK, .metatype = NLA_U32, .name = "skbmark", .synopsis = "skb mark 32 bit metadata", .check_presence = skbmark_check, .encode = skbmark_encode, .decode = skbmark_decode, .get = ife_get_meta_u32, .alloc = ife_alloc_meta_u32, .release = ife_release_meta_gen, .validate = ife_validate_meta_u32, .owner = THIS_MODULE, }; static int __init ifemark_init_module(void) { return register_ife_op(&ife_skbmark_ops); } static void __exit ifemark_cleanup_module(void) { unregister_ife_op(&ife_skbmark_ops); } module_init(ifemark_init_module); module_exit(ifemark_cleanup_module); MODULE_AUTHOR("Jamal Hadi Salim(2015)"); MODULE_DESCRIPTION("Inter-FE skb mark metadata module"); MODULE_LICENSE("GPL"); MODULE_ALIAS_IFE_META(IFE_META_SKBMARK); xfrm/Makefile?id=6989606a7224a2d5a925df22a49e4f7a0bfed0d6'>commitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net/xfrm/Makefile')
h>parent
62e13097c46c69dbd7544ab2cd585ccf48f360a4 (diff)
parent6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can')
-rw-r--r--net/can/af_can.c12
-rw-r--r--net/can/af_can.h3
-rw-r--r--net/can/bcm.c27
-rw-r--r--net/can/gw.c2
-rw-r--r--net/can/raw.c4
5 files changed, 33 insertions, 15 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c