Commit 32929e1f authored by Alain Michaud's avatar Alain Michaud Committed by Marcel Holtmann
Browse files

Bluetooth: Use only 8 bits for the HCI CMSG state flags 



This change implements suggestions from the code review of the SCO CMSG
state flag patch.

Signed-off-by: default avatarAlain Michaud <alainm@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 00398e1d

include/net/bluetooth/hci_sock.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

net/bluetooth/hci_sock.c

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct hci_pinfo { 
	struct bt_sock    bt;

	struct hci_dev    *hdev;

	struct hci_filter filter;

	__u32             cmsg_mask;

	__u8              cmsg_mask;

	unsigned short    channel;

	unsigned long     flags;

	__u32             cookie;
@@ -1399,7 +1399,7 @@ static int hci_sock_getname(struct socket *sock, struct sockaddr *addr, 
static void hci_sock_cmsg(struct sock *sk, struct msghdr *msg,

			  struct sk_buff *skb)

{

	__u32 mask = hci_pi(sk)->cmsg_mask;

	__u8 mask = hci_pi(sk)->cmsg_mask;



	if (mask & HCI_CMSG_DIR) {

		int incoming = bt_cb(skb)->incoming;