Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

2 files changed, 10 insertions, 4 deletions

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index a9750984f772..b7c4224f4e7d 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -211,6 +211,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst)
         conn->type  = type;
         conn->mode  = HCI_CM_ACTIVE;
         conn->state = BT_OPEN;
+        conn->auth_type = HCI_AT_GENERAL_BONDING;
 
         conn->power_save = 1;
         conn->disc_timeout = HCI_DISCONN_TIMEOUT;
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 77e9fb130adb..947f8bbb4bb3 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -2205,7 +2205,7 @@ static int l2cap_build_conf_req(struct sock *sk, void *data)
 {
         struct l2cap_pinfo *pi = l2cap_pi(sk);
         struct l2cap_conf_req *req = data;
-        struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_ERTM };
+        struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_BASIC };
         void *ptr = req->data;
 
         BT_DBG("sk %p", sk);
@@ -2394,6 +2394,10 @@ done:
                         rfc.monitor_timeout = L2CAP_DEFAULT_MONITOR_TO;
 
                         pi->conf_state |= L2CAP_CONF_MODE_DONE;
+
+                        l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,
+                                        sizeof(rfc), (unsigned long) &rfc);
+
                         break;
 
                 case L2CAP_MODE_STREAMING:
@@ -2401,6 +2405,10 @@ done:
                         pi->max_pdu_size = rfc.max_pdu_size;
 
                         pi->conf_state |= L2CAP_CONF_MODE_DONE;
+
+                        l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,
+                                        sizeof(rfc), (unsigned long) &rfc);
+
                         break;
 
                 default:
@@ -2410,9 +2418,6 @@ done:
                         rfc.mode = pi->mode;
                 }
 
-                l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,
-                                        sizeof(rfc), (unsigned long) &rfc);
-
                 if (result == L2CAP_CONF_SUCCESS)
                         pi->conf_state |= L2CAP_CONF_OUTPUT_DONE;
         }