Commit d894b915 authored by Chas Williams's avatar Chas Williams Committed by Patrick McHardy

[ATM]: use clip_tbl instead of clp_tbl_hook (from Francois Romieu <romieu@fr.zoreil.com>)

parent 6cd2c39a
...@@ -885,7 +885,7 @@ static void *arp_get_idx(struct arp_state *state, loff_t l) ...@@ -885,7 +885,7 @@ static void *arp_get_idx(struct arp_state *state, loff_t l)
if (v) if (v)
goto done; goto done;
} }
state->n = clip_tbl_hook->hash_buckets[state->bucket + 1]; state->n = clip_tbl.hash_buckets[state->bucket + 1];
} }
done: done:
return v; return v;
...@@ -896,18 +896,12 @@ static void *arp_seq_start(struct seq_file *seq, loff_t *pos) ...@@ -896,18 +896,12 @@ static void *arp_seq_start(struct seq_file *seq, loff_t *pos)
struct arp_state *state = seq->private; struct arp_state *state = seq->private;
void *ret = (void *)1; void *ret = (void *)1;
if (!clip_tbl_hook) { read_lock_bh(&clip_tbl.lock);
state->bucket = -1;
goto out;
}
read_lock_bh(&clip_tbl_hook->lock);
state->bucket = 0; state->bucket = 0;
state->n = clip_tbl_hook->hash_buckets[0]; state->n = clip_tbl.hash_buckets[0];
state->vcc = (void *)1; state->vcc = (void *)1;
if (*pos) if (*pos)
ret = arp_get_idx(state, *pos); ret = arp_get_idx(state, *pos);
out:
return ret; return ret;
} }
...@@ -916,7 +910,7 @@ static void arp_seq_stop(struct seq_file *seq, void *v) ...@@ -916,7 +910,7 @@ static void arp_seq_stop(struct seq_file *seq, void *v)
struct arp_state *state = seq->private; struct arp_state *state = seq->private;
if (state->bucket != -1) if (state->bucket != -1)
read_unlock_bh(&clip_tbl_hook->lock); read_unlock_bh(&clip_tbl.lock);
} }
static void *arp_seq_next(struct seq_file *seq, void *v, loff_t *pos) static void *arp_seq_next(struct seq_file *seq, void *v, loff_t *pos)
......
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