include/linux/skbuff.h: move CONFIG_XFRM check inside the skb_sec_path()
Subsystems (2)
PATCH v2 1/1 include/linux/skbuff.h: move CONFIG_XFRM check inside the skb_sec_path()
And thus we have only one function definition
Signed-off-by Denis Kirjanov <[email protected]>
---v1->v2: rebase to net-next head
--- include/linux/skbuff.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
include/linux/skbuff.h +2 -5
@@ -2708,17 +2708,14 @@ static inline bool skb_rx_queue_recorded(const struct sk_buff *skb)u16 __skb_tx_hash (const struct net_device *dev,const struct sk_buff *skb,unsigned int num_tx_queues); -#ifdef CONFIG_XFRM static inline struct sec_path *skb_sec_path (struct sk_buff *skb) { +#ifdef CONFIG_XFRM return skb->sp; -}#else -static inline struct sec_path *skb_sec_path (struct sk_buff *skb) -{return NULL ; -}#endif +}/* Keeps track of mac header offset relative to skb->head. * It is useful for TSO of Tunneling protocol. e.g. GRE.
Signature · 1 line
1.8.0.2
From: Denis Kirjanov <[email protected]>
Date: Wed, 2 Oct 2013 05:58:32 +0400
Quoted 5 lines
And thus we have only one function definition
Signed-off-by Denis Kirjanov <[email protected]>---
v1->v2: rebase to net-next head
Applied, thanks.