diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 11:23:57 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 11:23:57 +0100 |
| commit | 440fdb53b4ae58602711b5b8c3a139ace2404dbb (patch) | |
| tree | c6fb88d6ad537ec53aeecadc75a61ab6147d4c9c /drivers/net/hamradio/bpqether.c | |
| parent | 8b2b403ce0f1a816b7a6a4f47c8798003b26c07a (diff) | |
| parent | 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/hamradio/bpqether.c')
| -rw-r--r-- | drivers/net/hamradio/bpqether.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index 656f2789c9b..cc0ee93669e 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c @@ -413,12 +413,12 @@ static void *bpq_seq_next(struct seq_file *seq, void *v, loff_t *pos) ++*pos; if (v == SEQ_START_TOKEN) - p = bpq_devices.next; + p = rcu_dereference(bpq_devices.next); else - p = ((struct bpqdev *)v)->bpq_list.next; + p = rcu_dereference(((struct bpqdev *)v)->bpq_list.next); return (p == &bpq_devices) ? NULL - : rcu_dereference(list_entry(p, struct bpqdev, bpq_list)); + : list_entry(p, struct bpqdev, bpq_list); } static void bpq_seq_stop(struct seq_file *seq, void *v) |