From eed5cd8214e233018d11b9d881c541a0671d6c27 Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Tue, 10 Jul 2012 04:45:50 +0000 Subject: [PATCH] --- yaml --- r: 315385 b: refs/heads/master c: f0396f60d7c165018c9b203fb9b89fb224835578 h: refs/heads/master i: 315383: da8fc19460f2bb99377b451dc030b38c4fec8035 v: v3 --- [refs] | 2 +- trunk/net/ipv6/route.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c60061737707..9edd8e4714d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ce09e899d2864b4c8ed8f777c396bcb953aa3c9 +refs/heads/master: f0396f60d7c165018c9b203fb9b89fb224835578 diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c index 2a4c8d48977f..412fad809a3b 100644 --- a/trunk/net/ipv6/route.c +++ b/trunk/net/ipv6/route.c @@ -2399,10 +2399,12 @@ static int rt6_fill_node(struct net *net, rtm->rtm_protocol = rt->rt6i_protocol; if (rt->rt6i_flags & RTF_DYNAMIC) rtm->rtm_protocol = RTPROT_REDIRECT; - else if (rt->rt6i_flags & RTF_ADDRCONF) - rtm->rtm_protocol = RTPROT_KERNEL; - else if (rt->rt6i_flags & RTF_DEFAULT) - rtm->rtm_protocol = RTPROT_RA; + else if (rt->rt6i_flags & RTF_ADDRCONF) { + if (rt->rt6i_flags & (RTF_DEFAULT | RTF_ROUTEINFO)) + rtm->rtm_protocol = RTPROT_RA; + else + rtm->rtm_protocol = RTPROT_KERNEL; + } if (rt->rt6i_flags & RTF_CACHE) rtm->rtm_flags |= RTM_F_CLONED;