Commit 9391976a authored Feb 19, 2015 by Jiri Slaby Committed by Marcel Holtmann Feb 27, 2015

Bluetooth: make hci_test_bit's addr const



gcc5 warns about passing a const array to hci_test_bit which takes a
non-const pointer:
net/bluetooth/hci_sock.c: In function ‘hci_sock_sendmsg’:
net/bluetooth/hci_sock.c:955:8: warning: passing argument 2 of ‘hci_test_bit’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-array-qualifiers]
        &hci_sec_filter.ocf_mask[ogf])) &&
        ^
net/bluetooth/hci_sock.c:49:19: note: expected ‘void *’ but argument is of type ‘const __u32 (*)[4] {aka const unsigned int (*)[4]}’
 static inline int hci_test_bit(int nr, void *addr)
                   ^

So make 'addr' 'const void *'.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: Johan Hedberg <johan.hedberg@gmail.com>

parent 4cd3928a

net/bluetooth/hci_sock.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -46,9 +46,9 @@ struct hci_pinfo {
		unsigned short channel;
		};

		static inline int hci_test_bit(int nr, void *addr)
		static inline int hci_test_bit(int nr, const void *addr)
		{
		return ((__u32 ) addr + (nr >> 5)) & ((__u32) 1 << (nr & 31));
		return ((const __u32 ) addr + (nr >> 5)) & ((__u32) 1 << (nr & 31));
		}

		/* Security filter */

Admin message