From 58d7d9b026e30fed675f0e4b40052b5bc83c26ed Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 10 Jul 2012 18:05:28 -0700 Subject: [PATCH] --- yaml --- r: 315063 b: refs/heads/master c: e044a651b9b7b1b33d8b7fdb2bb27e443f392083 h: refs/heads/master i: 315061: b5eae6ef1356440d8b68696f1b31f2eb56055c20 315059: 33d00faf9d6bbe8c2a19a53b190b583740e9b3f3 315055: d69b08aa85c4eb8ef59c07ddb8a599f3064ba08a v: v3 --- [refs] | 2 +- trunk/include/net/ip_fib.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e877696d882b..d7fa8b683ac2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 061a5c316b6526dbc729049a16243ec27937cc31 +refs/heads/master: e044a651b9b7b1b33d8b7fdb2bb27e443f392083 diff --git a/trunk/include/net/ip_fib.h b/trunk/include/net/ip_fib.h index 539c6721f810..000c4674e18e 100644 --- a/trunk/include/net/ip_fib.h +++ b/trunk/include/net/ip_fib.h @@ -230,6 +230,7 @@ static inline int fib_lookup(struct net *net, struct flowi4 *flp, struct fib_result *res) { if (!net->ipv4.fib_has_custom_rules) { + res->r = NULL; if (net->ipv4.fib_local && !fib_table_lookup(net->ipv4.fib_local, flp, res, FIB_LOOKUP_NOREF))