Bluetooth: Remove unneeded control vars

Trivial clean up.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: João Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index d0d0330..5a5203f 100644 (file)
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -1239,7 +1239,6 @@ static int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr, int *l
 static void l2cap_monitor_timeout(unsigned long arg)
 {
        struct sock *sk = (void *) arg;
-       u16 control;
 
        bh_lock_sock(sk);
        if (l2cap_pi(sk)->retry_count >= l2cap_pi(sk)->remote_max_tx) {
@@ -1251,15 +1250,13 @@ static void l2cap_monitor_timeout(unsigned long arg)
        l2cap_pi(sk)->retry_count++;
        __mod_monitor_timer();
 
-       control = L2CAP_CTRL_POLL;
-       l2cap_send_rr_or_rnr(l2cap_pi(sk), control);
+       l2cap_send_rr_or_rnr(l2cap_pi(sk), L2CAP_CTRL_POLL);
        bh_unlock_sock(sk);
 }
 
 static void l2cap_retrans_timeout(unsigned long arg)
 {
        struct sock *sk = (void *) arg;
-       u16 control;
 
        bh_lock_sock(sk);
        l2cap_pi(sk)->retry_count = 1;
@@ -1267,8 +1264,7 @@ static void l2cap_retrans_timeout(unsigned long arg)
 
        l2cap_pi(sk)->conn_state |= L2CAP_CONN_WAIT_F;
 
-       control = L2CAP_CTRL_POLL;
-       l2cap_send_rr_or_rnr(l2cap_pi(sk), control);
+       l2cap_send_rr_or_rnr(l2cap_pi(sk), L2CAP_CTRL_POLL);
        bh_unlock_sock(sk);
 }
 
@@ -3716,10 +3712,8 @@ static inline void l2cap_data_channel_rnrframe(struct sock *sk, u16 rx_control)
 
        if (!(pi->conn_state & L2CAP_CONN_SREJ_SENT)) {
                del_timer(&pi->retrans_timer);
-               if (rx_control & L2CAP_CTRL_POLL) {
-                       u16 control = L2CAP_CTRL_FINAL;
-                       l2cap_send_rr_or_rnr(pi, control);
-               }
+               if (rx_control & L2CAP_CTRL_POLL)
+                       l2cap_send_rr_or_rnr(pi, L2CAP_CTRL_FINAL);
                return;
        }