Bluetooth: convert flushable variable to flag in l2cap chan

flushable variable inside l2cap_chan is a logical one and can
be easily converted to flag. Added flags in l2cap_chan structure.

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

2 files changed, 10 insertions, 5 deletions

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 3158cec9e274..b21ecfffcaa9 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1253,7 +1253,8 @@ static void l2cap_do_send(struct l2cap_chan *chan, struct sk_buff *skb)
 
         BT_DBG("chan %p, skb %p len %d", chan, skb, skb->len);
 
-        if (!chan->flushable && lmp_no_flush_capable(hcon->hdev))
+        if (!test_bit(FLAG_FLUSHABLE, &chan->flags) &&
+                                        lmp_no_flush_capable(hcon->hdev))
                 flags = ACL_START_NO_FLUSH;
         else
                 flags = ACL_START;
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 61f1f623091d..99782cb4f0b4 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -446,7 +446,8 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, ch
                 break;
 
         case BT_FLUSHABLE:
-                if (put_user(chan->flushable, (u32 __user *) optval))
+                if (put_user(test_bit(FLAG_FLUSHABLE, &chan->flags),
+                                                (u32 __user *) optval))
                         err = -EFAULT;
 
                 break;
@@ -655,7 +656,10 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
                         }
                 }
 
-                chan->flushable = opt;
+                if (opt)
+                        set_bit(FLAG_FLUSHABLE, &chan->flags);
+                else
+                        clear_bit(FLAG_FLUSHABLE, &chan->flags);
                 break;
 
         case BT_POWER:
@@ -931,7 +935,7 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
                 chan->sec_level = pchan->sec_level;
                 chan->role_switch = pchan->role_switch;
                 chan->force_reliable = pchan->force_reliable;
-                chan->flushable = pchan->flushable;
+                chan->flags = pchan->flags;
                 chan->force_active = pchan->force_active;
         } else {
 
@@ -962,7 +966,7 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
                 chan->sec_level = BT_SECURITY_LOW;
                 chan->role_switch = 0;
                 chan->force_reliable = 0;
-                chan->flushable = BT_FLUSHABLE_OFF;
+                chan->flags = 0;
                 chan->force_active = BT_POWER_FORCE_ACTIVE_ON;
 
         }