Skip to content

Commit 8de2d79

Browse files
amirvdavem330
authored andcommitted
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: John Fastabend <[email protected]> Acked-by: Jiri Pirko <[email protected]> Signed-off-by: Amir Vadai <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 5b33f48 commit 8de2d79

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

include/net/flow_dissector.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,17 @@ static inline bool flow_keys_have_l4(struct flow_keys *keys)
184184

185185
u32 flow_hash_from_keys(struct flow_keys *keys);
186186

187+
static inline bool dissector_uses_key(const struct flow_dissector *flow_dissector,
188+
enum flow_dissector_key_id key_id)
189+
{
190+
return flow_dissector->used_keys & (1 << key_id);
191+
}
192+
193+
static inline void *skb_flow_dissector_target(struct flow_dissector *flow_dissector,
194+
enum flow_dissector_key_id key_id,
195+
void *target_container)
196+
{
197+
return ((char *)target_container) + flow_dissector->offset[key_id];
198+
}
199+
187200
#endif

net/core/flow_dissector.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,12 @@
1919
#include <net/flow_dissector.h>
2020
#include <scsi/fc/fc_fcoe.h>
2121

22-
static bool dissector_uses_key(const struct flow_dissector *flow_dissector,
23-
enum flow_dissector_key_id key_id)
24-
{
25-
return flow_dissector->used_keys & (1 << key_id);
26-
}
27-
2822
static void dissector_set_key(struct flow_dissector *flow_dissector,
2923
enum flow_dissector_key_id key_id)
3024
{
3125
flow_dissector->used_keys |= (1 << key_id);
3226
}
3327

34-
static void *skb_flow_dissector_target(struct flow_dissector *flow_dissector,
35-
enum flow_dissector_key_id key_id,
36-
void *target_container)
37-
{
38-
return ((char *) target_container) + flow_dissector->offset[key_id];
39-
}
40-
4128
void skb_flow_dissector_init(struct flow_dissector *flow_dissector,
4229
const struct flow_dissector_key *key,
4330
unsigned int key_count)

0 commit comments

Comments
 (0)