Commit 0b3d8e08 authored by Denis Kirjanov's avatar Denis Kirjanov Committed by David S. Miller
Browse files

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



And thus we have only one function definition

Signed-off-by: default avatarDenis Kirjanov <kda@linux-powerpc.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6ae70532

include/linux/skbuff.h

+2 −5
Original line number Original line Diff line number Diff line
@@ -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,

u16 __skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb,

		  unsigned int num_tx_queues);

		  unsigned int num_tx_queues);





#ifdef CONFIG_XFRM

static inline struct sec_path *skb_sec_path(struct sk_buff *skb)

static inline struct sec_path *skb_sec_path(struct sk_buff *skb)

{

{

#ifdef CONFIG_XFRM

	return skb->sp;

	return skb->sp;

}

#else

#else

static inline struct sec_path *skb_sec_path(struct sk_buff *skb)

{

	return NULL;

	return NULL;

}

#endif

#endif

}





/* Keeps track of mac header offset relative to skb->head.

/* Keeps track of mac header offset relative to skb->head.

 * It is useful for TSO of Tunneling protocol. e.g. GRE.

 * It is useful for TSO of Tunneling protocol. e.g. GRE.