diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-06 13:30:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-06 13:30:43 -0700 |
| commit | e225567960db50e9810a152c8621c7a6ed94de71 (patch) | |
| tree | d0129e2988f8aea56d4f00f04c4818c2e8cc07a2 /net/bluetooth/hci_sock.c | |
| parent | 4b030d4288a569d6bdeca884d7f102d951f097f2 (diff) | |
| parent | a24d52f390a77ce90dc8cf0cd75d27ec0a6ea3f8 (diff) | |
| download | lwn-e225567960db50e9810a152c8621c7a6ed94de71.tar.gz lwn-e225567960db50e9810a152c8621c7a6ed94de71.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/bluetooth/hci_sock.c')
| -rw-r--r-- | net/bluetooth/hci_sock.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 4f170a595934..83acd164d39e 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -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); |