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

Commit 10b89ee4 authored May 12, 2015 by Jiri Pirko Committed by David S. Miller May 13, 2015

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: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b0a31431

include/linux/skbuff.h

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -3424,10 +3424,6 @@ struct sk_buff skb_checksum_trimmed(struct sk_buff skb,
	unsigned int transport_len,		unsigned int transport_len,
	__sum16(skb_chkf)(struct sk_buff skb));		__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_head_is_locked - Determine if the skb->head is locked down
	* @skb: skb to check		* @skb: skb to check

include/net/flow_dissector.h

+3 −0

Original line number	Original line	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 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:		/* struct flow_keys_digest:
	*		*

net/core/filter.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,7 @@
	#include <net/netlink.h>		#include <net/netlink.h>
	#include <linux/skbuff.h>		#include <linux/skbuff.h>
	#include <net/sock.h>		#include <net/sock.h>
			#include <net/flow_dissector.h>
	#include <linux/errno.h>		#include <linux/errno.h>
	#include <linux/timer.h>		#include <linux/timer.h>
	#include <asm/uaccess.h>		#include <asm/uaccess.h>

net/ethernet/eth.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -58,6 +58,7 @@
	#include <net/ipv6.h>		#include <net/ipv6.h>
	#include <net/ip.h>		#include <net/ip.h>
	#include <net/dsa.h>		#include <net/dsa.h>
			#include <net/flow_dissector.h>
	#include <linux/uaccess.h>		#include <linux/uaccess.h>

	__setup("ether=", netdev_boot_setup);		__setup("ether=", netdev_boot_setup);