Commit 6a5d58b6 authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

net sched ife action: add 16 bit helpers 



encoder and checker for 16 bits metadata

Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 766a0e97

include/net/tc_act/tc_ife.h

+2 −0
Original line number Diff line number Diff line
@@ -50,9 +50,11 @@ int ife_tlv_meta_encode(void *skbdata, u16 attrtype, u16 dlen, 
int ife_alloc_meta_u32(struct tcf_meta_info *mi, void *metaval, gfp_t gfp);

int ife_alloc_meta_u16(struct tcf_meta_info *mi, void *metaval, gfp_t gfp);

int ife_check_meta_u32(u32 metaval, struct tcf_meta_info *mi);

int ife_check_meta_u16(u16 metaval, struct tcf_meta_info *mi);

int ife_encode_meta_u32(u32 metaval, void *skbdata, struct tcf_meta_info *mi);

int ife_validate_meta_u32(void *val, int len);

int ife_validate_meta_u16(void *val, int len);

int ife_encode_meta_u16(u16 metaval, void *skbdata, struct tcf_meta_info *mi);

void ife_release_meta_gen(struct tcf_meta_info *mi);

int register_ife_op(struct tcf_meta_ops *mops);

int unregister_ife_op(struct tcf_meta_ops *mops);

net/sched/act_ife.c

+26 −0
Original line number Diff line number Diff line
@@ -63,6 +63,23 @@ int ife_tlv_meta_encode(void *skbdata, u16 attrtype, u16 dlen, const void *dval) 
}

EXPORT_SYMBOL_GPL(ife_tlv_meta_encode);



int ife_encode_meta_u16(u16 metaval, void *skbdata, struct tcf_meta_info *mi)

{

	u16 edata = 0;



	if (mi->metaval)

		edata = *(u16 *)mi->metaval;

	else if (metaval)

		edata = metaval;



	if (!edata) /* will not encode */

		return 0;



	edata = htons(edata);

	return ife_tlv_meta_encode(skbdata, mi->metaid, 2, &edata);

}

EXPORT_SYMBOL_GPL(ife_encode_meta_u16);



int ife_get_meta_u32(struct sk_buff *skb, struct tcf_meta_info *mi)

{

	if (mi->metaval)
@@ -81,6 +98,15 @@ int ife_check_meta_u32(u32 metaval, struct tcf_meta_info *mi) 
}

EXPORT_SYMBOL_GPL(ife_check_meta_u32);



int ife_check_meta_u16(u16 metaval, struct tcf_meta_info *mi)

{

	if (metaval || mi->metaval)

		return 8; /* T+L+(V) == 2+2+(2+2bytepad) */



	return 0;

}

EXPORT_SYMBOL_GPL(ife_check_meta_u16);



int ife_encode_meta_u32(u32 metaval, void *skbdata, struct tcf_meta_info *mi)

{

	u32 edata = metaval;