diff options
| author | David S. Miller <davem@davemloft.net> | 2020-07-31 15:11:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-31 15:11:52 -0700 |
| commit | 4bb540dbe442ec5e4b48af8aed12663e0754bbe2 (patch) | |
| tree | a641506cb5aac389bb3c9f2d6042ce53cfb6732c /include/net/bluetooth/hci_sock.h | |
| parent | bd69058f50d5ffa659423bcfa6fe6280ce9c760a (diff) | |
| parent | 075f77324f90149bac12c8a705dae5786a1d24fb (diff) | |
| download | linux-4bb540dbe442ec5e4b48af8aed12663e0754bbe2.tar.bz2 | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2020-07-31
Here's the main bluetooth-next pull request for 5.9:
- Fix firmware filenames for Marvell chipsets
- Several suspend-related fixes
- Addedd mgmt commands for runtime configuration
- Multiple fixes for Qualcomm-based controllers
- Add new monitoring feature for mgmt
- Fix handling of legacy cipher (E4) together with security level 4
- Add support for Realtek 8822CE controller
- Fix issues with Chinese controllers using fake VID/PID values
- Multiple other smaller fixes & improvements
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/bluetooth/hci_sock.h')
| -rw-r--r-- | include/net/bluetooth/hci_sock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/bluetooth/hci_sock.h b/include/net/bluetooth/hci_sock.h index 9352bb1bf34c..9949870f7d78 100644 --- a/include/net/bluetooth/hci_sock.h +++ b/include/net/bluetooth/hci_sock.h @@ -31,8 +31,8 @@ #define HCI_TIME_STAMP 3 /* CMSG flags */ -#define HCI_CMSG_DIR 0x0001 -#define HCI_CMSG_TSTAMP 0x0002 +#define HCI_CMSG_DIR 0x01 +#define HCI_CMSG_TSTAMP 0x02 struct sockaddr_hci { sa_family_t hci_family; |