* [ATM]: use clip_tbl instead of clp_tbl_hook (from Francois Romieu <romieu@fr.zoreil.com>)
[not found] <20040206231309.A26646@electric-eye.fr.zoreil.com>
@ 2004-02-24 1:22 ` chas williams (contractor)
2004-02-25 8:24 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: chas williams (contractor) @ 2004-02-24 1:22 UTC (permalink / raw)
To: davem, Francois Romieu; +Cc: netdev
please apply to 2.6 --thanks
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1552 -> 1.1553
# net/atm/clip.c 1.31 -> 1.32
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/02/23 chas@relax.cmf.nrl.navy.mil 1.1553
# [ATM]: use clip_tbl instead of clp_tbl_hook (from Francois Romieu <romieu@fr.zoreil.com>)
# --------------------------------------------
#
diff -Nru a/net/atm/clip.c b/net/atm/clip.c
--- a/net/atm/clip.c Mon Feb 23 20:11:20 2004
+++ b/net/atm/clip.c Mon Feb 23 20:11:20 2004
@@ -899,7 +899,7 @@
if (v)
goto done;
}
- state->n = clip_tbl_hook->hash_buckets[state->bucket + 1];
+ state->n = clip_tbl.hash_buckets[state->bucket + 1];
}
done:
return v;
@@ -910,18 +910,12 @@
struct arp_state *state = seq->private;
void *ret = (void *)1;
- if (!clip_tbl_hook) {
- state->bucket = -1;
- goto out;
- }
-
- read_lock_bh(&clip_tbl_hook->lock);
+ read_lock_bh(&clip_tbl.lock);
state->bucket = 0;
- state->n = clip_tbl_hook->hash_buckets[0];
+ state->n = clip_tbl.hash_buckets[0];
state->vcc = (void *)1;
if (*pos)
ret = arp_get_idx(state, *pos);
-out:
return ret;
}
@@ -930,7 +924,7 @@
struct arp_state *state = seq->private;
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)
^ permalink raw reply [flat|nested] 2+ messages in thread