diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2003-08-20 22:13:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-08-20 22:13:10 -0700 |
| commit | fa85be80ad1b5c79ba143de0429bbccec9e36d64 (patch) | |
| tree | 1fe577b0cae720032446ad7e24983b81a830c422 /net | |
| parent | 7384a506036cd8ce4131b619d65af859a9b2bb11 (diff) | |
[TOKENRING]: spin_lock consistency.
Use spin_lock on hash table consistently, this code is only called
from bottom half context, never from interrupt context so use spin_lock_bh.
Diffstat (limited to 'net')
| -rw-r--r-- | net/802/tr.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/net/802/tr.c b/net/802/tr.c index 42bec87a1a89..91792c2c74d6 100644 --- a/net/802/tr.c +++ b/net/802/tr.c @@ -236,9 +236,8 @@ void tr_source_route(struct sk_buff *skb,struct trh_hdr *trh,struct net_device * struct rif_cache_s *entry; unsigned char *olddata; unsigned char mcast_func_addr[] = {0xC0,0x00,0x00,0x04,0x00,0x00}; - unsigned long flags ; - spin_lock_irqsave(&rif_lock,flags); + spin_lock_bh(&rif_lock); /* * Broadcasts are single route as stated in RFC 1042 @@ -308,7 +307,7 @@ printk("source routing for %02X:%02X:%02X:%02X:%02X:%02X\n",trh->daddr[0], else slack = 18 - ((ntohs(trh->rcf) & TR_RCF_LEN_MASK)>>8); olddata = skb->data; - spin_unlock_irqrestore(&rif_lock,flags); + spin_unlock_bh(&rif_lock); skb_pull(skb, slack); memmove(skb->data, olddata, sizeof(struct trh_hdr) - slack); @@ -418,9 +417,8 @@ static void rif_check_expire(unsigned long dummy) { int i; unsigned long now=jiffies; - unsigned long flags ; - spin_lock_irqsave(&rif_lock,flags); + spin_lock_bh(&rif_lock); for(i=0; i < RIF_TABLE_SIZE;i++) { @@ -440,7 +438,7 @@ static void rif_check_expire(unsigned long dummy) } } - spin_unlock_irqrestore(&rif_lock,flags); + spin_unlock_bh(&rif_lock); /* * Reset the timer @@ -477,10 +475,7 @@ static struct rif_cache_s *rif_get_idx(loff_t pos) static void *rif_seq_start(struct seq_file *seq, loff_t *pos) { - unsigned long flags; - - spin_lock_irqsave(&rif_lock, flags); - seq->private = (void *) flags; + spin_lock_bh(&rif_lock); return *pos ? rif_get_idx(*pos - 1) : RIF_PROC_START; } @@ -492,8 +487,7 @@ static void *rif_seq_next(struct seq_file *seq, void *v, loff_t *pos) static void rif_seq_stop(struct seq_file *seq, void *v) { - unsigned long flags = (unsigned long) seq->private; - spin_lock_irqsave(&rif_lock, flags); + spin_unlock_bh(&rif_lock); } static int rif_seq_show(struct seq_file *seq, void *v) |