From: Denis Kirjanov <kda@linux-powerpc.org>
Date: Wed, 2 Oct 2013 01:58:32 +0000 (+0400)
Subject: include/linux/skbuff.h: move CONFIG_XFRM check inside the skb_sec_path()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0b3d8e087bbee2a4e3f479d538a7edd3f1d2950c;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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.