Commit 10b89ee4 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: move *skb_get_poff declarations into correct header 



Since these functions are defined in flow_dissector.c, move header
declarations from skbuff.h into flow_dissector.h

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b0a31431

include/linux/skbuff.h

+0 −4
Original line number Diff line number Diff line
@@ -3424,10 +3424,6 @@ struct sk_buff *skb_checksum_trimmed(struct sk_buff *skb, 
				     unsigned int transport_len,

				     __sum16(*skb_chkf)(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);



/**

 * skb_head_is_locked - Determine if the skb->head is locked down

 * @skb: skb to check

include/net/flow_dissector.h

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ static inline __be32 skb_flow_get_ports(const struct sk_buff *skb, 
}



u32 flow_hash_from_keys(struct flow_keys *keys);

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:

 *

net/core/filter.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <net/netlink.h>

#include <linux/skbuff.h>

#include <net/sock.h>

#include <net/flow_dissector.h>

#include <linux/errno.h>

#include <linux/timer.h>

#include <asm/uaccess.h>

net/ethernet/eth.c

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include <net/ipv6.h>

#include <net/ip.h>

#include <net/dsa.h>

#include <net/flow_dissector.h>

#include <linux/uaccess.h>



__setup("ether=", netdev_boot_setup);