projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6ae7053
)
include/linux/skbuff.h: move CONFIG_XFRM check inside the skb_sec_path()
author
Denis Kirjanov
<
[email protected]
>
Wed, 2 Oct 2013 01:58:32 +0000
(
05:58
+0400)
committer
David S. Miller
<
[email protected]
>
Wed, 2 Oct 2013 20:50:40 +0000
(16:50 -0400)
And thus we have only one function definition
Signed-off-by: Denis Kirjanov <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
include/linux/skbuff.h
patch
|
blob
|
history
diff --git
a/include/linux/skbuff.h
b/include/linux/skbuff.h
index 71b1d9402fd33f16cf1115734c2f9f535e789acb..1cd32f96055e4ca0f2072a30b6f8ba26fd28b65d 100644
(file)
--- 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.