lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[136/156] ipv6: Dont drop cache route entry unless timer actually expired.
    2.6.33-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>

    [ Upstream commit 54c1a859efd9fd6cda05bc700315ba2519c14eba ]

    This is ipv6 variant of the commit 5e016cbf6.. ("ipv4: Don't drop
    redirected route cache entry unless PTMU actually expired")
    by Guenter Roeck <guenter.roeck@ericsson.com>.

    Remove cache route entry in ipv6_negative_advice() only if
    the timer is expired.

    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    net/ipv6/route.c | 13 +++++++++----
    1 file changed, 9 insertions(+), 4 deletions(-)

    --- a/net/ipv6/route.c
    +++ b/net/ipv6/route.c
    @@ -897,12 +897,17 @@ static struct dst_entry *ip6_negative_ad
    struct rt6_info *rt = (struct rt6_info *) dst;

    if (rt) {
    - if (rt->rt6i_flags & RTF_CACHE)
    - ip6_del_rt(rt);
    - else
    + if (rt->rt6i_flags & RTF_CACHE) {
    + if (rt6_check_expired(rt)) {
    + ip6_del_rt(rt);
    + dst = NULL;
    + }
    + } else {
    dst_release(dst);
    + dst = NULL;
    + }
    }
    - return NULL;
    + return dst;
    }

    static void ip6_link_failure(struct sk_buff *skb)

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2010-03-31 01:27    [W:0.035 / U:0.088 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site