lkml.org 
[lkml]   [2013]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 35/66] net: dst: provide accessor function to dst->xfrm
    Date
    3.11-stable 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    include/net/dst.h | 12 ++++++++++++
    1 file changed, 12 insertions(+)

    --- a/include/net/dst.h
    +++ b/include/net/dst.h
    @@ -477,10 +477,22 @@ static inline struct dst_entry *xfrm_loo
    {
    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 */



    \
     
     \ /
      Last update: 2013-11-02 01:21    [W:5.114 / U:0.552 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site