diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-10-18 13:56:17 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-18 13:56:17 -0400 |
| commit | b231070a18d833f425179f2b51c5b22fb6374c7c (patch) | |
| tree | dfdc60810e10a1c0b5e70c1c182f47bac0ca3141 /include/net/bluetooth/bluetooth.h | |
| parent | b6b561c31d51db3dec0cb55412a5d7a1a2397521 (diff) | |
| parent | 4b836f393bd8ed111857a6ee1865e44627266ec6 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'include/net/bluetooth/bluetooth.h')
| -rw-r--r-- | include/net/bluetooth/bluetooth.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 5fd510675cf..bf2ddffdae2 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -218,11 +218,10 @@ void baswap(bdaddr_t *dst, bdaddr_t *src); struct bt_sock { struct sock sk; - bdaddr_t src; - bdaddr_t dst; struct list_head accept_q; struct sock *parent; unsigned long flags; + void (*skb_msg_name)(struct sk_buff *, void *, int *); }; enum { @@ -285,6 +284,8 @@ struct bt_skb_cb { __u8 force_active; struct l2cap_ctrl control; struct hci_req_ctrl req; + bdaddr_t bdaddr; + __le16 psm; }; #define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb)) |