Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaa04dc3 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents 8812304c 68ae6639

net/bluetooth/hci_conn.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -211,6 +211,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst) 
	conn->type  = type;

	conn->type  = type;

	conn->mode  = HCI_CM_ACTIVE;

	conn->mode  = HCI_CM_ACTIVE;

	conn->state = BT_OPEN;

	conn->state = BT_OPEN;

	conn->auth_type = HCI_AT_GENERAL_BONDING;





	conn->power_save = 1;

	conn->power_save = 1;

	conn->disc_timeout = HCI_DISCONN_TIMEOUT;

	conn->disc_timeout = HCI_DISCONN_TIMEOUT;

net/bluetooth/l2cap.c

+9 −4
Original line number Original line Diff line number Diff line
@@ -2205,7 +2205,7 @@ static int l2cap_build_conf_req(struct sock *sk, void *data) 
{

{

	struct l2cap_pinfo *pi = l2cap_pi(sk);

	struct l2cap_pinfo *pi = l2cap_pi(sk);

	struct l2cap_conf_req *req = data;

	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;

	void *ptr = req->data;





	BT_DBG("sk %p", sk);

	BT_DBG("sk %p", sk);
@@ -2394,6 +2394,10 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data) 
			rfc.monitor_timeout = L2CAP_DEFAULT_MONITOR_TO;

			rfc.monitor_timeout = L2CAP_DEFAULT_MONITOR_TO;





			pi->conf_state |= L2CAP_CONF_MODE_DONE;

			pi->conf_state |= L2CAP_CONF_MODE_DONE;



			l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,

					sizeof(rfc), (unsigned long) &rfc);



			break;

			break;





		case L2CAP_MODE_STREAMING:

		case L2CAP_MODE_STREAMING:
@@ -2401,6 +2405,10 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data) 
			pi->max_pdu_size = rfc.max_pdu_size;

			pi->max_pdu_size = rfc.max_pdu_size;





			pi->conf_state |= L2CAP_CONF_MODE_DONE;

			pi->conf_state |= L2CAP_CONF_MODE_DONE;



			l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,

					sizeof(rfc), (unsigned long) &rfc);



			break;

			break;





		default:

		default:
@@ -2410,9 +2418,6 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data) 
			rfc.mode = pi->mode;

			rfc.mode = pi->mode;

		}

		}





		l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,

					sizeof(rfc), (unsigned long) &rfc);



		if (result == L2CAP_CONF_SUCCESS)

		if (result == L2CAP_CONF_SUCCESS)

			pi->conf_state |= L2CAP_CONF_OUTPUT_DONE;

			pi->conf_state |= L2CAP_CONF_OUTPUT_DONE;

	}

	}