summaryrefslogtreecommitdiff
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:23:41 -0800
commit3e5d72cd013a30bbd3a835243b635f0b85c4dd0a (patch)
tree79b48fb112d98c9631a7e2a1ff1b5428fb1cf1db
parent225be57bbaf2c104f339b1a21efc25ff6b6bd9cb (diff)
downloadlwn-3e5d72cd013a30bbd3a835243b635f0b85c4dd0a.tar.gz
lwn-3e5d72cd013a30bbd3a835243b635f0b85c4dd0a.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 8197eadca819..1efe71aad089 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -464,10 +464,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 */