Messages in this thread Patch in this message | | | From | Greg Kroah-Hartman <> | Subject | [ 18/32] net: dst: provide accessor function to dst->xfrm | Date | Fri, 1 Nov 2013 14:43:29 -0700 |
| |
3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vlad Yasevich <vyasevich@gmail.com>
[ Upstream commit e87b3998d795123b4139bc3f25490dd236f68212 ]
dst->xfrm is conditionally defined. Provide accessor funtion that is always available.
Signed-off-by: Vlad Yasevich <vyasevich@gmail.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- include/net/dst.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
--- a/include/net/dst.h +++ b/include/net/dst.h @@ -464,10 +464,22 @@ static inline struct dst_entry *xfrm_loo { return dst_orig; } + +static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst) +{ + return NULL; +} + #else extern struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig, const 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 /* _NET_DST_H */
| |