diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 17:50:37 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 17:50:37 +0200 |
commit | 236fa08168dd82af29a76c31c40b4148403774c0 (patch) | |
tree | 73456604747ede3536a5b851ce4615aab96237f7 /net/ipv4/fib_trie.c | |
parent | [PATCH] gfp_t: the rest (diff) | |
parent | [IPV4]: Fix setting broadcast for SIOCSIFNETMASK (diff) | |
download | linux-236fa08168dd82af29a76c31c40b4148403774c0.tar.xz linux-236fa08168dd82af29a76c31c40b4148403774c0.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.15
Diffstat (limited to 'net/ipv4/fib_trie.c')
-rw-r--r-- | net/ipv4/fib_trie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 0093ea08c7f5..66247f38b371 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -2404,7 +2404,7 @@ static int fib_route_seq_show(struct seq_file *seq, void *v) prefix = htonl(l->key); list_for_each_entry_rcu(fa, &li->falh, fa_list) { - const struct fib_info *fi = rcu_dereference(fa->fa_info); + const struct fib_info *fi = fa->fa_info; unsigned flags = fib_flag_trans(fa->fa_type, mask, fi); if (fa->fa_type == RTN_BROADCAST |