diff options
| author | Dima Zavin <dima@android.com> | 2010-11-11 15:31:45 -0800 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2010-11-11 15:31:45 -0800 |
| commit | 8086994fdfc62889cfe70cc1d729cc0fe0166d2f (patch) | |
| tree | f9206dabea1d9e6a363a8548027fdeec02e07126 /include | |
| parent | 9b95be845359742cfd490c0da670009ff6222496 (diff) | |
| parent | 676f45fb33bbbe462d6164043353ac138cb38b53 (diff) | |
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/bluetooth.h | 6 | ||||
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 2 | ||||
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 30fce0128dd7..642cda89b1e7 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -64,6 +64,11 @@ struct bt_security { #define BT_DEFER_SETUP 7 +#define BT_POWER 8 +struct bt_power { + __u8 force_active; +}; + #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) @@ -142,6 +147,7 @@ struct bt_skb_cb { __u8 tx_seq; __u8 retries; __u8 sar; + __u8 force_active; }; #define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb)) diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 1ce134720cfe..95b5f024fb35 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -353,7 +353,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); diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 8f8e648032e8..22885e05a826 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -329,6 +329,7 @@ struct l2cap_pinfo { __u8 role_switch; __u8 force_reliable; __u8 flushable; + __u8 force_active; __u8 conf_req[64]; __u8 conf_len; |