Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 22225
b: refs/heads/master
c: 5ddf0eb
h: refs/heads/master
i:
  22223: 3425f34
v: v3
  • Loading branch information
Robert Olsson authored and David S. Miller committed Mar 21, 2006
1 parent 9050391 commit dc22a54
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4f81c32b028aecd818634b1ef36aae3b2b3e66ce
refs/heads/master: 5ddf0eb2bfd613e941dd8748870c71da2e5ad409
12 changes: 10 additions & 2 deletions trunk/net/ipv4/fib_trie.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
* Patrick McHardy <kaber@trash.net>
*/

#define VERSION "0.404"
#define VERSION "0.405"

#include <linux/config.h>
#include <asm/uaccess.h>
Expand Down Expand Up @@ -2040,7 +2040,15 @@ static struct node *fib_trie_get_next(struct fib_trie_iter *iter)
static struct node *fib_trie_get_first(struct fib_trie_iter *iter,
struct trie *t)
{
struct node *n = rcu_dereference(t->trie);
struct node *n ;

if(!t)
return NULL;

n = rcu_dereference(t->trie);

if(!iter)
return NULL;

if (n && IS_TNODE(n)) {
iter->tnode = (struct tnode *) n;
Expand Down

0 comments on commit dc22a54

Please sign in to comment.