diff options
Diffstat (limited to 'include/net/xfrm.h')
-rw-r--r-- | include/net/xfrm.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 11c890ad8ebb..45e11b3631e4 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
@@ -467,7 +467,6 @@ struct xfrm_policy_walk { | |||
467 | 467 | ||
468 | struct xfrm_policy | 468 | struct xfrm_policy |
469 | { | 469 | { |
470 | struct xfrm_policy *next; | ||
471 | struct hlist_node bydst; | 470 | struct hlist_node bydst; |
472 | struct hlist_node byidx; | 471 | struct hlist_node byidx; |
473 | 472 | ||
@@ -882,6 +881,7 @@ struct xfrm_dst | |||
882 | u32 path_cookie; | 881 | u32 path_cookie; |
883 | }; | 882 | }; |
884 | 883 | ||
884 | #ifdef CONFIG_XFRM | ||
885 | static inline void xfrm_dst_destroy(struct xfrm_dst *xdst) | 885 | static inline void xfrm_dst_destroy(struct xfrm_dst *xdst) |
886 | { | 886 | { |
887 | dst_release(xdst->route); | 887 | dst_release(xdst->route); |
@@ -894,6 +894,7 @@ static inline void xfrm_dst_destroy(struct xfrm_dst *xdst) | |||
894 | xdst->partner = NULL; | 894 | xdst->partner = NULL; |
895 | #endif | 895 | #endif |
896 | } | 896 | } |
897 | #endif | ||
897 | 898 | ||
898 | extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev); | 899 | extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev); |
899 | 900 | ||
@@ -1536,9 +1537,11 @@ static inline void xfrm_states_delete(struct xfrm_state **states, int n) | |||
1536 | } | 1537 | } |
1537 | #endif | 1538 | #endif |
1538 | 1539 | ||
1540 | #ifdef CONFIG_XFRM | ||
1539 | static inline struct xfrm_state *xfrm_input_state(struct sk_buff *skb) | 1541 | static inline struct xfrm_state *xfrm_input_state(struct sk_buff *skb) |
1540 | { | 1542 | { |
1541 | return skb->sp->xvec[skb->sp->len - 1]; | 1543 | return skb->sp->xvec[skb->sp->len - 1]; |
1542 | } | 1544 | } |
1545 | #endif | ||
1543 | 1546 | ||
1544 | #endif /* _NET_XFRM_H */ | 1547 | #endif /* _NET_XFRM_H */ |