diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-12 16:57:04 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-12 16:57:04 +0200 |
| commit | 42d887a68013b0a04f7b8ebfa4999a8d5df6775c (patch) | |
| tree | 8cbd8cebe7420f3bcee87e3be0421aed215db450 /include | |
| parent | team: fix checks in team_get_first_port_txable_rcu() (diff) | |
| parent | b43: stop format string leaking into error msgs (diff) | |
| download | linux-42d887a68013b0a04f7b8ebfa4999a8d5df6775c.tar.xz linux-42d887a68013b0a04f7b8ebfa4999a8d5df6775c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 1 | ||||
| -rw-r--r-- | include/net/bluetooth/mgmt.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 35a57cd1704c..7cb6d360d147 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -1117,6 +1117,7 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event); int mgmt_control(struct sock *sk, struct msghdr *msg, size_t len); int mgmt_index_added(struct hci_dev *hdev); int mgmt_index_removed(struct hci_dev *hdev); +int mgmt_set_powered_failed(struct hci_dev *hdev, int err); int mgmt_powered(struct hci_dev *hdev, u8 powered); int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable); int mgmt_connectable(struct hci_dev *hdev, u8 connectable); diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h index 22980a7c3873..9944c3e68c5d 100644 --- a/include/net/bluetooth/mgmt.h +++ b/include/net/bluetooth/mgmt.h @@ -42,6 +42,7 @@ #define MGMT_STATUS_NOT_POWERED 0x0f #define MGMT_STATUS_CANCELLED 0x10 #define MGMT_STATUS_INVALID_INDEX 0x11 +#define MGMT_STATUS_RFKILLED 0x12 struct mgmt_hdr { __le16 opcode; |