summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Yasevich <vyasevich@gmail.com>2013-10-15 22:01:29 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-04 04:31:03 -0800
commitc9446ff691aca0ca902f31f7a9830ac725841759 (patch)
treeb0f0df96f61a8c85f694f2d7838b0b3996fe107c
parentd14db2327635ac00aa7332bf26759d13ff39e2a5 (diff)
downloadlinux-stable-c9446ff691aca0ca902f31f7a9830ac725841759.tar.gz
linux-stable-c9446ff691aca0ca902f31f7a9830ac725841759.tar.bz2
linux-stable-c9446ff691aca0ca902f31f7a9830ac725841759.zip
net: dst: provide accessor function to dst->xfrm
[ 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>
-rw-r--r--include/net/dst.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/include/net/dst.h b/include/net/dst.h
index 1f8fd109e225..e0c97f5a57cf 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -477,10 +477,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 */