diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-04 14:51:28 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-04 14:51:28 -0500 |
| commit | 87bc0728d462ae37841a550542829aa65a97e7c2 (patch) | |
| tree | 266afb90f501b814c0a79f10a7afd86a6a33d631 /include/net/bluetooth/bluetooth.h | |
| parent | f421436a591d34fa5279b54a96ac07d70250cc8d (diff) | |
| parent | 01925efdf7e03b4b803b5c9f985163d687f7f017 (diff) | |
| download | linux-87bc0728d462ae37841a550542829aa65a97e7c2.tar.gz linux-87bc0728d462ae37841a550542829aa65a97e7c2.tar.bz2 linux-87bc0728d462ae37841a550542829aa65a97e7c2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
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 d0de412bfa43..2cc9517fb0d5 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)) |