Commit 14b12d0b authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Gustavo F. Padovan
Browse files

Bluetooth: Add BT_POWER L2CAP socket option. 



Add BT_POWER socket option used to control the power
characteristics of the underlying ACL link. When the remote end
has put the link in sniff mode and the host stack wants to send
data we need need to explicitly exit sniff mode to work well with
certain devices (For example, A2DP on Plantronics Voyager 855).
However, this causes problems with HID devices.

Hence, moving into active mode when sending data, irrespective
of who set the sniff mode has been made as a socket option. By
default, we will move into active mode. HID devices can set the
L2CAP socket option to prevent this from happening.

Currently, this has been implemented for L2CAP sockets. This has been
tested with incoming and outgoing L2CAP sockets for HID and A2DP.

Based on discussions on linux-bluetooth and patches submitted by
Andrei Emeltchenko.

Signed-off-by: default avatarJaikumar Ganesh <jaikumar@google.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 96d97a67

include/net/bluetooth/bluetooth.h

+8 −0
Original line number Diff line number Diff line
@@ -69,6 +69,13 @@ struct bt_security { 
#define BT_FLUSHABLE_OFF	0

#define BT_FLUSHABLE_ON		1



#define BT_POWER	9

struct bt_power {

	__u8 force_active;

};

#define BT_POWER_FORCE_ACTIVE_OFF 0

#define BT_POWER_FORCE_ACTIVE_ON  1



#define BT_INFO(fmt, arg...) printk(KERN_INFO "Bluetooth: " fmt "\n" , ## arg)

#define BT_ERR(fmt, arg...)  printk(KERN_ERR "%s: " fmt "\n" , __func__ , ## arg)

#define BT_DBG(fmt, arg...)  pr_debug("%s: " fmt "\n" , __func__ , ## arg)
@@ -150,6 +157,7 @@ struct bt_skb_cb { 
	__u8 retries;

	__u8 sar;

	unsigned short channel;

	__u8 force_active;

};

#define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb))

include/net/bluetooth/hci_core.h

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type); 
int hci_conn_change_link_key(struct hci_conn *conn);

int hci_conn_switch_role(struct hci_conn *conn, __u8 role);



void hci_conn_enter_active_mode(struct hci_conn *conn);

void hci_conn_enter_active_mode(struct hci_conn *conn, __u8 force_active);

void hci_conn_enter_sniff_mode(struct hci_conn *conn);



void hci_conn_hold_device(struct hci_conn *conn);

include/net/bluetooth/l2cap.h

+1 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ struct l2cap_chan { 
	__u8		role_switch;

	__u8		force_reliable;

	__u8		flushable;

	__u8		force_active;



	__u8		ident;

net/bluetooth/hci_conn.c

+6 −3
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8 
	if (acl->state == BT_CONNECTED &&

			(sco->state == BT_OPEN || sco->state == BT_CLOSED)) {

		acl->power_save = 1;

		hci_conn_enter_active_mode(acl);

		hci_conn_enter_active_mode(acl, BT_POWER_FORCE_ACTIVE_ON);



		if (test_bit(HCI_CONN_MODE_CHANGE_PEND, &acl->pend)) {

			/* defer SCO setup until mode change completed */
@@ -688,7 +688,7 @@ int hci_conn_switch_role(struct hci_conn *conn, __u8 role) 
EXPORT_SYMBOL(hci_conn_switch_role);



/* Enter active mode */

void hci_conn_enter_active_mode(struct hci_conn *conn)

void hci_conn_enter_active_mode(struct hci_conn *conn, __u8 force_active)

{

	struct hci_dev *hdev = conn->hdev;
@@ -697,7 +697,10 @@ void hci_conn_enter_active_mode(struct hci_conn *conn) 
	if (test_bit(HCI_RAW, &hdev->flags))

		return;



	if (conn->mode != HCI_CM_SNIFF || !conn->power_save)

	if (conn->mode != HCI_CM_SNIFF)

		goto timer;



	if (!conn->power_save && !force_active)

		goto timer;



	if (!test_and_set_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) {

net/bluetooth/hci_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1969,7 +1969,7 @@ static inline void hci_sched_acl(struct hci_dev *hdev) 
		while (quote-- && (skb = skb_dequeue(&conn->data_q))) {

			BT_DBG("skb %p len %d", skb, skb->len);



			hci_conn_enter_active_mode(conn);

			hci_conn_enter_active_mode(conn, bt_cb(skb)->force_active);



			hci_send_frame(skb);

			hdev->acl_last_tx = jiffies;
@@ -2108,7 +2108,7 @@ static inline void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb) 
	if (conn) {

		register struct hci_proto *hp;



		hci_conn_enter_active_mode(conn);

		hci_conn_enter_active_mode(conn, bt_cb(skb)->force_active);



		/* Send to upper protocol */

		hp = hci_proto[HCI_PROTO_L2CAP];

CRA Git | Maintained and supported by SUSTech CRA and CCSE