lkml.org 
[lkml]   [2014]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 035/143] net: dst: provide accessor function to dst->xfrm
    2.6.32-longterm 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: Willy Tarreau <w@1wt.eu>
    ---
    include/net/dst.h | 11 +++++++++++
    1 file changed, 11 insertions(+)

    diff --git a/include/net/dst.h b/include/net/dst.h
    index 5a900dd..49f443b 100644
    --- a/include/net/dst.h
    +++ b/include/net/dst.h
    @@ -286,11 +286,22 @@ static inline int __xfrm_lookup(struct net *net, struct dst_entry **dst_p,
    {
    return 0;
    }
    +static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst)
    +{
    + return NULL;
    +}
    +
    #else
    extern int xfrm_lookup(struct net *net, struct dst_entry **dst_p,
    struct flowi *fl, struct sock *sk, int flags);
    extern int __xfrm_lookup(struct net *net, struct dst_entry **dst_p,
    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

    --
    1.7.12.2.21.g234cd45.dirty




    \
     
     \ /
      Last update: 2014-05-12 05:21    [W:5.775 / U:1.948 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site