Return-Path: Message-Id: <20140512003202.093305438@1wt.eu> Date: Mon, 12 May 2014 02:32:35 +0200 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vlad Yasevich , Neil Horman , "David S. Miller" , Willy Tarreau Subject: [ 035/143] net: dst: provide accessor function to dst->xfrm In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-ID: 2.6.32-longterm review patch. If anyone has any objections, please let me know. ------------------ From: Vlad Yasevich [ Upstream commit e87b3998d795123b4139bc3f25490dd236f68212 ] dst->xfrm is conditionally defined. Provide accessor funtion that is always available. Signed-off-by: Vlad Yasevich Acked-by: Neil Horman Signed-off-by: David S. Miller Signed-off-by: Willy Tarreau --- include/net/dst.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/net/dst.h b/include/net/dst.h index 5a900dd..49f443b 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -286,11 +286,22 @@ static inline int __xfrm_lookup(struct net *net, struct dst_entry **dst_p, { return 0; } +static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst) +{ + return NULL; +} + #else extern int xfrm_lookup(struct net *net, struct dst_entry **dst_p, struct flowi *fl, struct sock *sk, int flags); extern int __xfrm_lookup(struct net *net, struct dst_entry **dst_p, struct flowi *fl, struct sock *sk, int flags); + +/* skb attached with this dst needs transformation if dst->xfrm is valid */ +static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst) +{ + return dst->xfrm; +} #endif #endif -- 1.7.12.2.21.g234cd45.dirty