Commit 33019ec1 authored by David S. Miller's avatar David S. Miller

Merge bk://kernel.bkbits.net/acme/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents b72f319c 15d9a078
...@@ -1282,7 +1282,7 @@ static void arp_seq_stop(struct seq_file *seq, void *v) ...@@ -1282,7 +1282,7 @@ static void arp_seq_stop(struct seq_file *seq, void *v)
{ {
struct arp_iter_state* state = seq->private; struct arp_iter_state* state = seq->private;
if (!state->is_pneigh) if (!state->is_pneigh && v != (void *)1)
read_unlock_bh(&arp_tbl.lock); read_unlock_bh(&arp_tbl.lock);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment