summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenis Kirjanov <kda@linux-powerpc.org>2013-10-02 05:58:32 +0400
committerDavid S. Miller <davem@davemloft.net>2013-10-02 16:50:40 -0400
commit0b3d8e087bbee2a4e3f479d538a7edd3f1d2950c (patch)
tree426b2e87d70a32f76abc940e83af3cdb2f09f443 /include
parent6ae705323b716ea7a8cc26bee79176398a9b2e89 (diff)
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 <kda@linux-powerpc.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/skbuff.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 71b1d9402fd3..1cd32f96055e 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -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.