From 9f581c8dcea52adc1ef1626c4d5332161be0870b Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 11 Jun 2012 15:52:29 -0700 Subject: [PATCH] --- yaml --- r: 313958 b: refs/heads/master c: 55afabaa0df0dd139c8796a71beb43d1216fbe43 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/ip6_route.h | 2 +- trunk/include/net/route.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2456e286d96e..19a702db53f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 352e04b9111d608bd89ba7bd8070846d4f97d104 +refs/heads/master: 55afabaa0df0dd139c8796a71beb43d1216fbe43 diff --git a/trunk/include/net/ip6_route.h b/trunk/include/net/ip6_route.h index f88a85cf31c3..a2cda240ca95 100644 --- a/trunk/include/net/ip6_route.h +++ b/trunk/include/net/ip6_route.h @@ -61,7 +61,7 @@ static inline struct inet_peer *__rt6_get_peer(struct rt6_info *rt, int create) return rt6_peer_ptr(rt); rt6_bind_peer(rt, create); - return rt6_peer_ptr(rt); + return (rt6_has_peer(rt) ? rt6_peer_ptr(rt) : NULL); } static inline struct inet_peer *rt6_get_peer(struct rt6_info *rt) diff --git a/trunk/include/net/route.h b/trunk/include/net/route.h index cc693a5bb20d..2bfbc9329ea9 100644 --- a/trunk/include/net/route.h +++ b/trunk/include/net/route.h @@ -334,7 +334,7 @@ static inline struct inet_peer *__rt_get_peer(struct rtable *rt, __be32 daddr, i return rt_peer_ptr(rt); rt_bind_peer(rt, daddr, create); - return rt_peer_ptr(rt); + return (rt_has_peer(rt) ? rt_peer_ptr(rt) : NULL); } static inline struct inet_peer *rt_get_peer(struct rtable *rt, __be32 daddr)