Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 183990
b: refs/heads/master
c: 216437e
h: refs/heads/master
v: v3
  • Loading branch information
Li Zefan authored and David S. Miller committed Feb 10, 2010
1 parent e1cd522 commit 5034d4b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 25 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: 4f134204f740d9fbf992843a6615175f5105f49e
refs/heads/master: 216437eb8b5adf12ab91e1f0c046ffba22c63431
28 changes: 4 additions & 24 deletions trunk/net/irda/irlan/irlan_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -1128,34 +1128,14 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len)
*/
static void *irlan_seq_start(struct seq_file *seq, loff_t *pos)
{
int i = 1;
struct irlan_cb *self;

rcu_read_lock();
if (*pos == 0)
return SEQ_START_TOKEN;

list_for_each_entry(self, &irlans, dev_list) {
if (*pos == i)
return self;
++i;
}
return NULL;
return seq_list_start_head(&irlans, *pos);
}

/* Return entry after v, and increment pos */
static void *irlan_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{
struct list_head *nxt;

++*pos;
if (v == SEQ_START_TOKEN)
nxt = irlans.next;
else
nxt = ((struct irlan_cb *)v)->dev_list.next;

return (nxt == &irlans) ? NULL
: list_entry(nxt, struct irlan_cb, dev_list);
return seq_list_next(v, &irlans, pos);
}

/* End of reading /proc file */
Expand All @@ -1170,10 +1150,10 @@ static void irlan_seq_stop(struct seq_file *seq, void *v)
*/
static int irlan_seq_show(struct seq_file *seq, void *v)
{
if (v == SEQ_START_TOKEN)
if (v == &irlans)
seq_puts(seq, "IrLAN instances:\n");
else {
struct irlan_cb *self = v;
struct irlan_cb *self = list_entry(v, struct irlan_cb, dev_list);

IRDA_ASSERT(self != NULL, return -1;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
Expand Down

0 comments on commit 5034d4b

Please sign in to comment.