Bluetooth: convert force_reliable variable to flag in l2cap chan

force_reliable variable inside l2cap_chan is a logical one and can
be easily converted to flag

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

1 files changed, 6 insertions, 4 deletions

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 99782cb4f0b4..405d736131e2 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -359,7 +359,7 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, char __us
                 if (chan->role_switch)
                         opt |= L2CAP_LM_MASTER;
 
-                if (chan->force_reliable)
+                if (test_bit(FLAG_FORCE_RELIABLE, &chan->flags))
                         opt |= L2CAP_LM_RELIABLE;
 
                 if (put_user(opt, (u32 __user *) optval))
@@ -550,7 +550,11 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __us
                         chan->sec_level = BT_SECURITY_HIGH;
 
                 chan->role_switch    = (opt & L2CAP_LM_MASTER);
-                chan->force_reliable = (opt & L2CAP_LM_RELIABLE);
+
+                if (opt & L2CAP_LM_RELIABLE)
+                        set_bit(FLAG_FORCE_RELIABLE, &chan->flags);
+                else
+                        clear_bit(FLAG_FORCE_RELIABLE, &chan->flags);
                 break;
 
         default:
@@ -934,7 +938,6 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
                 chan->tx_win = pchan->tx_win;
                 chan->sec_level = pchan->sec_level;
                 chan->role_switch = pchan->role_switch;
-                chan->force_reliable = pchan->force_reliable;
                 chan->flags = pchan->flags;
                 chan->force_active = pchan->force_active;
         } else {
@@ -965,7 +968,6 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
                 chan->tx_win = L2CAP_DEFAULT_TX_WINDOW;
                 chan->sec_level = BT_SECURITY_LOW;
                 chan->role_switch = 0;
-                chan->force_reliable = 0;
                 chan->flags = 0;
                 chan->force_active = BT_POWER_FORCE_ACTIVE_ON;