|
@@ -994,8 +994,8 @@ int rose_route_frame(struct sk_buff *skb, ax25_cb *ax25)
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
- len = (((skb->data[3] >> 4) & 0x0F) + 1) / 2;
|
|
|
|
- len += (((skb->data[3] >> 0) & 0x0F) + 1) / 2;
|
|
|
|
|
|
+ len = (((skb->data[3] >> 4) & 0x0F) + 1) >> 1;
|
|
|
|
+ len += (((skb->data[3] >> 0) & 0x0F) + 1) >> 1;
|
|
|
|
|
|
memset(&facilities, 0x00, sizeof(struct rose_facilities_struct));
|
|
memset(&facilities, 0x00, sizeof(struct rose_facilities_struct));
|
|
|
|
|
|
@@ -1068,6 +1068,7 @@ out:
|
|
#ifdef CONFIG_PROC_FS
|
|
#ifdef CONFIG_PROC_FS
|
|
|
|
|
|
static void *rose_node_start(struct seq_file *seq, loff_t *pos)
|
|
static void *rose_node_start(struct seq_file *seq, loff_t *pos)
|
|
|
|
+ __acquires(rose_neigh_list_lock)
|
|
{
|
|
{
|
|
struct rose_node *rose_node;
|
|
struct rose_node *rose_node;
|
|
int i = 1;
|
|
int i = 1;
|
|
@@ -1091,6 +1092,7 @@ static void *rose_node_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
}
|
|
}
|
|
|
|
|
|
static void rose_node_stop(struct seq_file *seq, void *v)
|
|
static void rose_node_stop(struct seq_file *seq, void *v)
|
|
|
|
+ __releases(rose_neigh_list_lock)
|
|
{
|
|
{
|
|
spin_unlock_bh(&rose_neigh_list_lock);
|
|
spin_unlock_bh(&rose_neigh_list_lock);
|
|
}
|
|
}
|
|
@@ -1144,6 +1146,7 @@ const struct file_operations rose_nodes_fops = {
|
|
};
|
|
};
|
|
|
|
|
|
static void *rose_neigh_start(struct seq_file *seq, loff_t *pos)
|
|
static void *rose_neigh_start(struct seq_file *seq, loff_t *pos)
|
|
|
|
+ __acquires(rose_neigh_list_lock)
|
|
{
|
|
{
|
|
struct rose_neigh *rose_neigh;
|
|
struct rose_neigh *rose_neigh;
|
|
int i = 1;
|
|
int i = 1;
|
|
@@ -1167,6 +1170,7 @@ static void *rose_neigh_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
}
|
|
}
|
|
|
|
|
|
static void rose_neigh_stop(struct seq_file *seq, void *v)
|
|
static void rose_neigh_stop(struct seq_file *seq, void *v)
|
|
|
|
+ __releases(rose_neigh_list_lock)
|
|
{
|
|
{
|
|
spin_unlock_bh(&rose_neigh_list_lock);
|
|
spin_unlock_bh(&rose_neigh_list_lock);
|
|
}
|
|
}
|
|
@@ -1227,6 +1231,7 @@ const struct file_operations rose_neigh_fops = {
|
|
|
|
|
|
|
|
|
|
static void *rose_route_start(struct seq_file *seq, loff_t *pos)
|
|
static void *rose_route_start(struct seq_file *seq, loff_t *pos)
|
|
|
|
+ __acquires(rose_route_list_lock)
|
|
{
|
|
{
|
|
struct rose_route *rose_route;
|
|
struct rose_route *rose_route;
|
|
int i = 1;
|
|
int i = 1;
|
|
@@ -1250,6 +1255,7 @@ static void *rose_route_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
}
|
|
}
|
|
|
|
|
|
static void rose_route_stop(struct seq_file *seq, void *v)
|
|
static void rose_route_stop(struct seq_file *seq, void *v)
|
|
|
|
+ __releases(rose_route_list_lock)
|
|
{
|
|
{
|
|
spin_unlock_bh(&rose_route_list_lock);
|
|
spin_unlock_bh(&rose_route_list_lock);
|
|
}
|
|
}
|