Skip to content

Commit

Permalink
net: dst: provide accessor function to dst->xfrm
Browse files Browse the repository at this point in the history
[ Upstream commit e87b399 ]

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>
  • Loading branch information
vyasevich authored and gregkh committed Nov 4, 2013
1 parent bbd7578 commit fd105ec
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions include/net/dst.h
Expand Up @@ -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 */

0 comments on commit fd105ec

Please sign in to comment.