[PATCH 3.8 32/91] net: dst: provide accessor function to dst->xfrm

Kamal Mostafa kamal at canonical.com
Fri Nov 8 02:14:47 UTC 2013 -stable review patch.  If anyone has any objections, please let me know.


From: Vlad Yasevich <vyasevich at gmail.com>

[ Upstream commit e87b3998d795123b4139bc3f25490dd236f68212 ]

dst->xfrm is conditionally defined.  Provide accessor funtion that
is always available.

Signed-off-by: Vlad Yasevich <vyasevich at gmail.com>
Acked-by: Neil Horman <nhorman at tuxdriver.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
 include/net/dst.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/include/net/dst.h b/include/net/dst.h
index b3ebe17..1cdf9a4 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -474,10 +474,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;
 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 /* _NET_DST_H */

More information about the kernel-team mailing list