Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea4bd8ba authored by David Miller's avatar David Miller Committed by Marcel Holtmann
Browse files

Bluetooth: Use list_head for HCI blacklist head 



The bdaddr in the list root is completely unused and just
taking up space.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Tested-by: default avatarJohan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b7753c8c

include/net/bluetooth/hci_core.h

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ struct hci_dev { 


	struct inquiry_cache	inq_cache;

	struct hci_conn_hash	conn_hash;

	struct bdaddr_list	blacklist;

	struct list_head	blacklist;



	struct hci_dev_stats	stat;

net/bluetooth/hci_core.c

+1 −1
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ int hci_register_dev(struct hci_dev *hdev) 


	hci_conn_hash_init(hdev);



	INIT_LIST_HEAD(&hdev->blacklist.list);

	INIT_LIST_HEAD(&hdev->blacklist);



	memset(&hdev->stat, 0, sizeof(struct hci_dev_stats));

net/bluetooth/hci_sock.c

+3 −5
Original line number Diff line number Diff line
@@ -168,9 +168,8 @@ static int hci_sock_release(struct socket *sock) 
struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr)

{

	struct list_head *p;

	struct bdaddr_list *blacklist = &hdev->blacklist;



	list_for_each(p, &blacklist->list) {

	list_for_each(p, &hdev->blacklist) {

		struct bdaddr_list *b;



		b = list_entry(p, struct bdaddr_list, list);
@@ -202,7 +201,7 @@ static int hci_blacklist_add(struct hci_dev *hdev, void __user *arg) 


	bacpy(&entry->bdaddr, &bdaddr);



	list_add(&entry->list, &hdev->blacklist.list);

	list_add(&entry->list, &hdev->blacklist);



	return 0;

}
@@ -210,9 +209,8 @@ static int hci_blacklist_add(struct hci_dev *hdev, void __user *arg) 
int hci_blacklist_clear(struct hci_dev *hdev)

{

	struct list_head *p, *n;

	struct bdaddr_list *blacklist = &hdev->blacklist;



	list_for_each_safe(p, n, &blacklist->list) {

	list_for_each_safe(p, n, &hdev->blacklist) {

		struct bdaddr_list *b;



		b = list_entry(p, struct bdaddr_list, list);

net/bluetooth/hci_sysfs.c

+1 −2
Original line number Diff line number Diff line
@@ -439,12 +439,11 @@ static const struct file_operations inquiry_cache_fops = { 
static int blacklist_show(struct seq_file *f, void *p)

{

	struct hci_dev *hdev = f->private;

	struct bdaddr_list *blacklist = &hdev->blacklist;

	struct list_head *l;



	hci_dev_lock_bh(hdev);



	list_for_each(l, &blacklist->list) {

	list_for_each(l, &hdev->blacklist) {

		struct bdaddr_list *b;

		bdaddr_t bdaddr;