Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8de2d793 authored by Amir Vadai's avatar Amir Vadai Committed by David S. Miller
Browse files

net/flow_dissector: Make dissector_uses_key() and skb_flow_dissector_target() public 



Will be used in a following patch to query if a key is being used, and
what it's value in the target object.

Acked-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarAmir Vadai <amir@vadai.me>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b33f488

include/net/flow_dissector.h

+13 −0
Original line number Diff line number Diff line
@@ -184,4 +184,17 @@ static inline bool flow_keys_have_l4(struct flow_keys *keys) 


u32 flow_hash_from_keys(struct flow_keys *keys);



static inline bool dissector_uses_key(const struct flow_dissector *flow_dissector,

				      enum flow_dissector_key_id key_id)

{

	return flow_dissector->used_keys & (1 << key_id);

}



static inline void *skb_flow_dissector_target(struct flow_dissector *flow_dissector,

					      enum flow_dissector_key_id key_id,

					      void *target_container)

{

	return ((char *)target_container) + flow_dissector->offset[key_id];

}



#endif

net/core/flow_dissector.c

+0 −13
Original line number Diff line number Diff line
@@ -19,25 +19,12 @@ 
#include <net/flow_dissector.h>

#include <scsi/fc/fc_fcoe.h>



static bool dissector_uses_key(const struct flow_dissector *flow_dissector,

			       enum flow_dissector_key_id key_id)

{

	return flow_dissector->used_keys & (1 << key_id);

}



static void dissector_set_key(struct flow_dissector *flow_dissector,

			      enum flow_dissector_key_id key_id)

{

	flow_dissector->used_keys |= (1 << key_id);

}



static void *skb_flow_dissector_target(struct flow_dissector *flow_dissector,

				       enum flow_dissector_key_id key_id,

				       void *target_container)

{

	return ((char *) target_container) + flow_dissector->offset[key_id];

}



void skb_flow_dissector_init(struct flow_dissector *flow_dissector,

			     const struct flow_dissector_key *key,

			     unsigned int key_count)