include/linux/skbuff.h: move CONFIG_XFRM check inside the skb_sec_path()

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

And thus we have only one function definition

Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Denis Kirjanov and committed by

David S. Miller 12 years ago 0b3d8e08 6ae70532

+3 -6

1 changed file

expand all

include

linux

skbuff.h

+3 -6

include/linux/skbuff.h

··· 2708 2708 u16 __skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb, 2709 2709 unsigned int num_tx_queues); 2710 2710 2711 + static inline struct sec_path *skb_sec_path(struct sk_buff *skb) 2712 + { 2711 2713 #ifdef CONFIG_XFRM 2712 - static inline struct sec_path *skb_sec_path(struct sk_buff *skb) 2713 - { 2714 2714 return skb->sp; 2715 - } 2716 2715 #else 2717 - static inline struct sec_path *skb_sec_path(struct sk_buff *skb) 2718 - { 2719 2716 return NULL; 2720 - } 2721 2717 #endif 2718 + } 2722 2719 2723 2720 /* Keeps track of mac header offset relative to skb->head. 2724 2721 * It is useful for TSO of Tunneling protocol. e.g. GRE.