浏览代码

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>
Denis Kirjanov 12 年之前
父节点
当前提交
0b3d8e087b
共有 1 个文件被更改,包括 2 次插入5 次删除
  1. 2 5
      include/linux/skbuff.h

+ 2 - 5
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,
 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.