diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-09-26 19:38:51 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-09-26 19:38:51 +0200 |
| commit | 30d3c071a64ad8a0aaef8fbd9513698889456680 (patch) | |
| tree | ec2402c9730db5a7b735d0d25025456d2b34d264 /include/net/bluetooth/bluetooth.h | |
| parent | Merge tag 'nfc-next-3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | Bluetooth: Rename sco_param_wideband table to esco_param_msbc (diff) | |
| download | linux-30d3c071a64ad8a0aaef8fbd9513698889456680.tar.xz linux-30d3c071a64ad8a0aaef8fbd9513698889456680.zip | |
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 373000de610d..58695ffeb138 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -120,9 +120,9 @@ struct bt_voice { #define BT_RCVMTU 13 __printf(1, 2) -int bt_info(const char *fmt, ...); +void bt_info(const char *fmt, ...); __printf(1, 2) -int bt_err(const char *fmt, ...); +void bt_err(const char *fmt, ...); #define BT_INFO(fmt, ...) bt_info(fmt "\n", ##__VA_ARGS__) #define BT_ERR(fmt, ...) bt_err(fmt "\n", ##__VA_ARGS__) @@ -284,6 +284,7 @@ struct hci_req_ctrl { struct bt_skb_cb { __u8 pkt_type; __u8 incoming; + __u16 opcode; __u16 expect; __u8 force_active; struct l2cap_chan *chan; |