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: Alain Michaud <alainm@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/include/net/bluetooth/hci_sock.h b/include/net/bluetooth/hci_sock.h
index 9352bb1bf34cb13628c3d33f9c0c3fb0c42ed1c2..9949870f7d780367cd9628522e9a3c00b024493f 100644 (file)
--- 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;

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index caf38a8ea6a8ba07f29647824862b9d86436e1ca..d5627967fc254f8f812c46357700cd2e37187922 100644 (file)
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -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 @@ done:
 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;