浏览代码

Bluetooth: Add hci_sock_test_flag helper function

The management interface will need access to the socket flags and so
provide a helper function for checking them.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Marcel Holtmann 10 年之前
父节点
当前提交
c85be545ea
共有 2 个文件被更改,包括 7 次插入1 次删除
  1. 1 0
      include/net/bluetooth/bluetooth.h
  2. 6 1
      net/bluetooth/hci_sock.c

+ 1 - 0
include/net/bluetooth/bluetooth.h

@@ -337,6 +337,7 @@ int bt_to_errno(__u16 code);
 
 
 void hci_sock_set_flag(struct sock *sk, int nr);
 void hci_sock_set_flag(struct sock *sk, int nr);
 void hci_sock_clear_flag(struct sock *sk, int nr);
 void hci_sock_clear_flag(struct sock *sk, int nr);
+int hci_sock_test_flag(struct sock *sk, int nr);
 
 
 int hci_sock_init(void);
 int hci_sock_init(void);
 void hci_sock_cleanup(void);
 void hci_sock_cleanup(void);

+ 6 - 1
net/bluetooth/hci_sock.c

@@ -60,6 +60,11 @@ void hci_sock_clear_flag(struct sock *sk, int nr)
 	clear_bit(nr, &hci_pi(sk)->flags);
 	clear_bit(nr, &hci_pi(sk)->flags);
 }
 }
 
 
+int hci_sock_test_flag(struct sock *sk, int nr)
+{
+	return test_bit(nr, &hci_pi(sk)->flags);
+}
+
 static inline int hci_test_bit(int nr, const void *addr)
 static inline int hci_test_bit(int nr, const void *addr)
 {
 {
 	return *((const __u32 *) addr + (nr >> 5)) & ((__u32) 1 << (nr & 31));
 	return *((const __u32 *) addr + (nr >> 5)) & ((__u32) 1 << (nr & 31));
@@ -211,7 +216,7 @@ void hci_send_to_channel(unsigned short channel, struct sk_buff *skb,
 		struct sk_buff *nskb;
 		struct sk_buff *nskb;
 
 
 		/* Ignore socket without the flag set */
 		/* Ignore socket without the flag set */
-		if (!test_bit(flag, &hci_pi(sk)->flags))
+		if (!hci_sock_test_flag(sk, flag))
 			continue;
 			continue;
 
 
 		/* Skip the original socket */
 		/* Skip the original socket */