aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/atm/br2684.c2
-rw-r--r--net/atm/lec.c2
-rw-r--r--net/atm/proc.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 5c8a0dcb1045..574d9a964176 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -663,6 +663,7 @@ static struct atm_ioctl br2684_ioctl_ops = {
663 663
664#ifdef CONFIG_PROC_FS 664#ifdef CONFIG_PROC_FS
665static void *br2684_seq_start(struct seq_file *seq, loff_t * pos) 665static void *br2684_seq_start(struct seq_file *seq, loff_t * pos)
666 __acquires(devs_lock)
666{ 667{
667 read_lock(&devs_lock); 668 read_lock(&devs_lock);
668 return seq_list_start(&br2684_devs, *pos); 669 return seq_list_start(&br2684_devs, *pos);
@@ -674,6 +675,7 @@ static void *br2684_seq_next(struct seq_file *seq, void *v, loff_t * pos)
674} 675}
675 676
676static void br2684_seq_stop(struct seq_file *seq, void *v) 677static void br2684_seq_stop(struct seq_file *seq, void *v)
678 __releases(devs_lock)
677{ 679{
678 read_unlock(&devs_lock); 680 read_unlock(&devs_lock);
679} 681}
diff --git a/net/atm/lec.c b/net/atm/lec.c
index 0a9c4261968f..1a8c4c6c0cd0 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -176,7 +176,7 @@ static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)
176static unsigned char *get_tr_dst(unsigned char *packet, unsigned char *rdesc) 176static unsigned char *get_tr_dst(unsigned char *packet, unsigned char *rdesc)
177{ 177{
178 struct trh_hdr *trh; 178 struct trh_hdr *trh;
179 int riflen, num_rdsc; 179 unsigned int riflen, num_rdsc;
180 180
181 trh = (struct trh_hdr *)packet; 181 trh = (struct trh_hdr *)packet;
182 if (trh->daddr[0] & (uint8_t) 0x80) 182 if (trh->daddr[0] & (uint8_t) 0x80)
diff --git a/net/atm/proc.c b/net/atm/proc.c
index 565e75e62ca4..49125110bb8b 100644
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -142,6 +142,7 @@ static int vcc_seq_release(struct inode *inode, struct file *file)
142} 142}
143 143
144static void *vcc_seq_start(struct seq_file *seq, loff_t *pos) 144static void *vcc_seq_start(struct seq_file *seq, loff_t *pos)
145 __acquires(vcc_sklist_lock)
145{ 146{
146 struct vcc_state *state = seq->private; 147 struct vcc_state *state = seq->private;
147 loff_t left = *pos; 148 loff_t left = *pos;
@@ -152,6 +153,7 @@ static void *vcc_seq_start(struct seq_file *seq, loff_t *pos)
152} 153}
153 154
154static void vcc_seq_stop(struct seq_file *seq, void *v) 155static void vcc_seq_stop(struct seq_file *seq, void *v)
156 __releases(vcc_sklist_lock)
155{ 157{
156 read_unlock(&vcc_sklist_lock); 158 read_unlock(&vcc_sklist_lock);
157} 159}