1 files changed, 3 insertions, 1 deletions

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index a028d37ba2e0..1bc0e85f04a5 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -570,7 +570,7 @@ static int ax25_setsockopt(struct socket *sock, int level, int optname,
                         res = -EINVAL;
                         break;
                 }
-                ax25->rtt = (opt * HZ) / 2;
+                ax25->rtt = (opt * HZ) >> 1;
                 ax25->t1  = opt * HZ;
                 break;
 
@@ -1863,6 +1863,7 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 #ifdef CONFIG_PROC_FS
 
 static void *ax25_info_start(struct seq_file *seq, loff_t *pos)
+        __acquires(ax25_list_lock)
 {
         struct ax25_cb *ax25;
         struct hlist_node *node;
@@ -1886,6 +1887,7 @@ static void *ax25_info_next(struct seq_file *seq, void *v, loff_t *pos)
 }
 
 static void ax25_info_stop(struct seq_file *seq, void *v)
+        __releases(ax25_list_lock)
 {
         spin_unlock_bh(&ax25_list_lock);
 }