Revert "Revert "Bluetooth: Introduce L2CAP_LM_FLUSHABLE to allow flushing of ACL...

This reverts commit 71682ea19f8d5d96034ce113acbbf83ac58173e6.

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 9716e5a2024f876a1193dc67915d789982862419..b32dcff93911fac45ce091612a6225146e07de1a 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -145,11 +145,14 @@ enum {
                        EDR_ESCO_MASK)
 
 /* ACL flags */
+#define ACL_START              0x00
 #define ACL_CONT               0x01
-#define ACL_START              0x02
+#define ACL_START_FLUSHABLE    0x02
 #define ACL_ACTIVE_BCAST       0x04
 #define ACL_PICO_BCAST         0x08
 
+#define ACL_PB_MASK    (ACL_CONT | ACL_START | ACL_START_FLUSHABLE)
+
 /* Baseband links */
 #define SCO_LINK       0x00
 #define ACL_LINK       0x01

diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 9516f4b4a3c235169404a1d589edfcb2eb378d46..904d9a9d1c5370f8d06c1ef09a9339ac8b1fd7b7 100644 (file)
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -70,6 +70,7 @@ struct l2cap_conninfo {
 #define L2CAP_LM_TRUSTED       0x0008
 #define L2CAP_LM_RELIABLE      0x0010
 #define L2CAP_LM_SECURE                0x0020
+#define L2CAP_LM_FLUSHABLE     0x0040
 
 /* L2CAP command codes */
 #define L2CAP_COMMAND_REJ      0x01
@@ -316,6 +317,7 @@ struct l2cap_pinfo {
        __u8            sec_level;
        __u8            role_switch;
        __u8            force_reliable;
+       __u8            flushable;
 
        __u8            conf_req[64];
        __u8            conf_len;

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index e1da8f68759c3a989fc8cd8ddde64949c204f5a1..84a9d75b0c61ede0e98150490abecee369f3fb0f 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1239,7 +1239,7 @@ int hci_send_acl(struct hci_conn *conn, struct sk_buff *skb, __u16 flags)
 
        skb->dev = (void *) hdev;
        bt_cb(skb)->pkt_type = HCI_ACLDATA_PKT;
-       hci_add_acl_hdr(skb, conn->handle, flags | ACL_START);
+       hci_add_acl_hdr(skb, conn->handle, flags);
 
        if (!(list = skb_shinfo(skb)->frag_list)) {
                /* Non fragmented */
@@ -1256,12 +1256,14 @@ int hci_send_acl(struct hci_conn *conn, struct sk_buff *skb, __u16 flags)
                spin_lock_bh(&conn->data_q.lock);
 
                __skb_queue_tail(&conn->data_q, skb);
+               flags &= ~ACL_PB_MASK;
+               flags |= ACL_CONT;
                do {
                        skb = list; list = list->next;
 
                        skb->dev = (void *) hdev;
                        bt_cb(skb)->pkt_type = HCI_ACLDATA_PKT;
-                       hci_add_acl_hdr(skb, conn->handle, flags | ACL_CONT);
+                       hci_add_acl_hdr(skb, conn->handle, flags);
 
                        BT_DBG("%s frag %p len %d", hdev->name, skb, skb->len);
 

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 6e3b59690d0e663b833ac3d683d71d92a6086e1b..b342f0680a7b812ac75db5aa22cfd3d44b738dd5 100644 (file)
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -331,7 +331,7 @@ static inline int l2cap_send_cmd(struct l2cap_conn *conn, u8 ident, u8 code, u16
        if (!skb)
                return -ENOMEM;
 
-       return hci_send_acl(conn->hcon, skb, 0);
+       return hci_send_acl(conn->hcon, skb, ACL_START);
 }
 
 static inline int l2cap_send_sframe(struct l2cap_pinfo *pi, u16 control)
@@ -770,6 +770,7 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
                pi->sec_level = l2cap_pi(parent)->sec_level;
                pi->role_switch = l2cap_pi(parent)->role_switch;
                pi->force_reliable = l2cap_pi(parent)->force_reliable;
+               pi->flushable = l2cap_pi(parent)->flushable;
        } else {
                pi->imtu = L2CAP_DEFAULT_MTU;
                pi->omtu = 0;
@@ -778,6 +779,7 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
                pi->sec_level = BT_SECURITY_LOW;
                pi->role_switch = 0;
                pi->force_reliable = 0;
+               pi->flushable = 0;
        }
 
        /* Default config options */
@@ -1259,10 +1261,16 @@ static inline int l2cap_do_send(struct sock *sk, struct sk_buff *skb)
 {
        struct l2cap_pinfo *pi = l2cap_pi(sk);
        int err;
+       u16 flags;
 
        BT_DBG("sk %p, skb %p len %d", sk, skb, skb->len);
 
-       err = hci_send_acl(pi->conn->hcon, skb, 0);
+       if (pi->flushable)
+               flags = ACL_START_FLUSHABLE;
+       else
+               flags = ACL_START;
+
+       err = hci_send_acl(pi->conn->hcon, skb, flags);
        if (err < 0)
                kfree_skb(skb);
 
@@ -1747,6 +1755,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __us
 
                l2cap_pi(sk)->role_switch    = (opt & L2CAP_LM_MASTER);
                l2cap_pi(sk)->force_reliable = (opt & L2CAP_LM_RELIABLE);
+               l2cap_pi(sk)->flushable = (opt & L2CAP_LM_FLUSHABLE);
                break;
 
        default:
@@ -1874,6 +1883,9 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, char __us
                if (l2cap_pi(sk)->force_reliable)
                        opt |= L2CAP_LM_RELIABLE;
 
+               if (l2cap_pi(sk)->flushable)
+                       opt |= L2CAP_LM_FLUSHABLE;
+
                if (put_user(opt, (u32 __user *) optval))
                        err = -EFAULT;
                break;
@@ -3801,7 +3813,7 @@ static int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 fl
 
        BT_DBG("conn %p len %d flags 0x%x", conn, skb->len, flags);
 
-       if (flags & ACL_START) {
+       if (!(flags & ACL_CONT)) {
                struct l2cap_hdr *hdr;
                int len;