| From | Ben Hutchings <> | Date | Mon, 25 Nov 2013 13:44:29 +0000 | Subject | [PATCH 3.2 14/87] net: dst: provide accessor function to dst->xfrm |
| |
3.2.53-rc1 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: Ben Hutchings <ben@decadent.org.uk> --- include/net/dst.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
diff --git a/include/net/dst.h b/include/net/dst.h index 16010d1..86ef78d 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -459,10 +459,22 @@ static inline struct dst_entry *xfrm_lookup(struct net *net, { 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 */
|