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

Commit e5276937 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

flow_dissector: Move skb related functions to skbuff.h 



Move the flow dissector functions that are specific to skbuffs into
skbuff.h out of flow_dissector.h. This makes flow_dissector.h have
no dependencies on skbuff.h.

Signed-off-by: default avatarTom Herbert <tom@herbertland.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d3d11fe0

include/linux/skbuff.h

+47 −0
Original line number Diff line number Diff line
@@ -945,6 +945,53 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, enum pkt_hash_types type) 
	skb->hash = hash;

}



void __skb_get_hash(struct sk_buff *skb);

u32 skb_get_poff(const struct sk_buff *skb);

u32 __skb_get_poff(const struct sk_buff *skb, void *data,

		   const struct flow_keys *keys, int hlen);

__be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,

			    void *data, int hlen_proto);



static inline __be32 skb_flow_get_ports(const struct sk_buff *skb,

					int thoff, u8 ip_proto)

{

	return __skb_flow_get_ports(skb, thoff, ip_proto, NULL, 0);

}



void skb_flow_dissector_init(struct flow_dissector *flow_dissector,

			     const struct flow_dissector_key *key,

			     unsigned int key_count);



bool __skb_flow_dissect(const struct sk_buff *skb,

			struct flow_dissector *flow_dissector,

			void *target_container,

			void *data, __be16 proto, int nhoff, int hlen);



static inline bool skb_flow_dissect(const struct sk_buff *skb,

				    struct flow_dissector *flow_dissector,

				    void *target_container)

{

	return __skb_flow_dissect(skb, flow_dissector, target_container,

				  NULL, 0, 0, 0);

}



static inline bool skb_flow_dissect_flow_keys(const struct sk_buff *skb,

					      struct flow_keys *flow)

{

	memset(flow, 0, sizeof(*flow));

	return __skb_flow_dissect(skb, &flow_keys_dissector, flow,

				  NULL, 0, 0, 0);

}



static inline bool skb_flow_dissect_flow_keys_buf(struct flow_keys *flow,

						  void *data, __be16 proto,

						  int nhoff, int hlen)

{

	memset(flow, 0, sizeof(*flow));

	return __skb_flow_dissect(NULL, &flow_keys_buf_dissector, flow,

				  data, proto, nhoff, hlen);

}



static inline __u32 skb_get_hash(struct sk_buff *skb)

{

	if (!skb->l4_hash && !skb->sw_hash)

include/net/flow_dissector.h

+0 −50
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define _NET_FLOW_DISSECTOR_H



#include <linux/types.h>

#include <linux/skbuff.h>

#include <linux/in6.h>

#include <uapi/linux/if_ether.h>
@@ -134,23 +133,6 @@ struct flow_dissector { 
	unsigned short int offset[FLOW_DISSECTOR_KEY_MAX];

};



void skb_flow_dissector_init(struct flow_dissector *flow_dissector,

			     const struct flow_dissector_key *key,

			     unsigned int key_count);



bool __skb_flow_dissect(const struct sk_buff *skb,

			struct flow_dissector *flow_dissector,

			void *target_container,

			void *data, __be16 proto, int nhoff, int hlen);



static inline bool skb_flow_dissect(const struct sk_buff *skb,

				    struct flow_dissector *flow_dissector,

				    void *target_container)

{

	return __skb_flow_dissect(skb, flow_dissector, target_container,

				  NULL, 0, 0, 0);

}



struct flow_keys {

	struct flow_dissector_key_control control;

#define FLOW_KEYS_HASH_START_FIELD basic
@@ -170,38 +152,6 @@ __be32 flow_get_u32_dst(const struct flow_keys *flow); 
extern struct flow_dissector flow_keys_dissector;

extern struct flow_dissector flow_keys_buf_dissector;



static inline bool skb_flow_dissect_flow_keys(const struct sk_buff *skb,

					      struct flow_keys *flow)

{

	memset(flow, 0, sizeof(*flow));

	return __skb_flow_dissect(skb, &flow_keys_dissector, flow,

				  NULL, 0, 0, 0);

}



static inline bool skb_flow_dissect_flow_keys_buf(struct flow_keys *flow,

						  void *data, __be16 proto,

						  int nhoff, int hlen)

{

	memset(flow, 0, sizeof(*flow));

	return __skb_flow_dissect(NULL, &flow_keys_buf_dissector, flow,

				  data, proto, nhoff, hlen);

}



__be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,

			    void *data, int hlen_proto);



static inline __be32 skb_flow_get_ports(const struct sk_buff *skb,

					int thoff, u8 ip_proto)

{

	return __skb_flow_get_ports(skb, thoff, ip_proto, NULL, 0);

}



u32 flow_hash_from_keys(struct flow_keys *keys);

void __skb_get_hash(struct sk_buff *skb);

u32 skb_get_poff(const struct sk_buff *skb);

u32 __skb_get_poff(const struct sk_buff *skb, void *data,

		   const struct flow_keys *keys, int hlen);



/* struct flow_keys_digest:

 *

 * This structure is used to hold a digest of the full flow keys. This is a