Skip to content

Commit

Permalink
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history 
…nel/git/bluetooth/bluetooth-next

Johan Hedberg says:

====================
pull request: bluetooth-next 2015-12-31

Here's (probably) the last bluetooth-next pull request for the 4.5
kernel:

 - Add support for BCM2E65 ACPI ID
 - Minor fixes/cleanups in the bcm203x & bfusb drivers
 - Minor debugfs related fix in 6lowpan code

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Dec 31, 2015
2 parents ccac042 + 7ddb692 commit 7b22a77
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 59 deletions.
4 changes: 1 addition & 3 deletions drivers/bluetooth/bcm203x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,8 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
return -ENODEV;

data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL);
if (!data) {
BT_ERR("Can't allocate memory for data structure");
if (!data)
return -ENOMEM;
}

data->udev = udev;
data->state = BCM203X_LOAD_MINIDRV;
Expand Down
6 changes: 2 additions & 4 deletions drivers/bluetooth/bfusb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -636,10 +636,8 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i

/* Initialize control structure and load firmware */
data = devm_kzalloc(&intf->dev, sizeof(struct bfusb_data), GFP_KERNEL);
if (!data) {
BT_ERR("Can't allocate memory for control structure");
goto done;
}
if (!data)
return -ENOMEM;

data->udev = udev;
data->bulk_in_ep = bulk_in_ep->desc.bEndpointAddress;
Expand Down
1 change: 1 addition & 0 deletions drivers/bluetooth/hci_bcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,7 @@ static const struct hci_uart_proto bcm_proto = {
#ifdef CONFIG_ACPI
static const struct acpi_device_id bcm_acpi_match[] = {
{ "BCM2E39", 0 },
{ "BCM2E65", 0 },
{ "BCM2E67", 0 },
{ },
};
Expand Down
6 changes: 3 additions & 3 deletions net/6lowpan/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ int lowpan_register_netdevice(struct net_device *dev,

lowpan_priv(dev)->lltype = lltype;

ret = lowpan_dev_debugfs_init(dev);
ret = register_netdevice(dev);
if (ret < 0)
return ret;

ret = register_netdevice(dev);
ret = lowpan_dev_debugfs_init(dev);
if (ret < 0)
lowpan_dev_debugfs_exit(dev);
unregister_netdevice(dev);

return ret;
}
Expand Down
12 changes: 6 additions & 6 deletions net/bluetooth/af_bluetooth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,13 @@ EXPORT_SYMBOL(bt_accept_unlink);

struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock)
{
struct list_head *p, *n;
struct bt_sock *s, *n;
struct sock *sk;

BT_DBG("parent %p", parent);

list_for_each_safe(p, n, &bt_sk(parent)->accept_q) {
sk = (struct sock *) list_entry(p, struct bt_sock, accept_q);
list_for_each_entry_safe(s, n, &bt_sk(parent)->accept_q, accept_q) {
sk = (struct sock *)s;

lock_sock(sk);

Expand Down Expand Up @@ -388,11 +388,11 @@ EXPORT_SYMBOL(bt_sock_stream_recvmsg);

static inline unsigned int bt_accept_poll(struct sock *parent)
{
struct list_head *p, *n;
struct bt_sock *s, *n;
struct sock *sk;

list_for_each_safe(p, n, &bt_sk(parent)->accept_q) {
sk = (struct sock *) list_entry(p, struct bt_sock, accept_q);
list_for_each_entry_safe(s, n, &bt_sk(parent)->accept_q, accept_q) {
sk = (struct sock *)s;
if (sk->sk_state == BT_CONNECTED ||
(test_bit(BT_SK_DEFER_SETUP, &bt_sk(parent)->flags) &&
sk->sk_state == BT_CONNECT2))
Expand Down
8 changes: 2 additions & 6 deletions net/bluetooth/cmtp/capi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,8 @@ static void cmtp_application_del(struct cmtp_session *session, struct cmtp_appli
static struct cmtp_application *cmtp_application_get(struct cmtp_session *session, int pattern, __u16 value)
{
struct cmtp_application *app;
struct list_head *p;

list_for_each(p, &session->applications) {
app = list_entry(p, struct cmtp_application, list);
list_for_each_entry(app, &session->applications, list) {
switch (pattern) {
case CMTP_MSGNUM:
if (app->msgnum == value)
Expand Down Expand Up @@ -511,14 +509,12 @@ static int cmtp_proc_show(struct seq_file *m, void *v)
struct capi_ctr *ctrl = m->private;
struct cmtp_session *session = ctrl->driverdata;
struct cmtp_application *app;
struct list_head *p;

seq_printf(m, "%s\n\n", cmtp_procinfo(ctrl));
seq_printf(m, "addr %s\n", session->name);
seq_printf(m, "ctrl %d\n", session->num);

list_for_each(p, &session->applications) {
app = list_entry(p, struct cmtp_application, list);
list_for_each_entry(app, &session->applications, list) {
seq_printf(m, "appl %d -> %d\n", app->appl, app->mapping);
}

Expand Down
8 changes: 3 additions & 5 deletions net/bluetooth/hci_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2713,12 +2713,10 @@ struct bdaddr_list *hci_bdaddr_list_lookup(struct list_head *bdaddr_list,

void hci_bdaddr_list_clear(struct list_head *bdaddr_list)
{
struct list_head *p, *n;
struct bdaddr_list *b, *n;

list_for_each_safe(p, n, bdaddr_list) {
struct bdaddr_list *b = list_entry(p, struct bdaddr_list, list);

list_del(p);
list_for_each_entry_safe(b, n, bdaddr_list, list) {
list_del(&b->list);
kfree(b);
}
}
Expand Down
46 changes: 14 additions & 32 deletions net/bluetooth/rfcomm/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -692,11 +692,9 @@ static struct rfcomm_session *rfcomm_session_del(struct rfcomm_session *s)

static struct rfcomm_session *rfcomm_session_get(bdaddr_t *src, bdaddr_t *dst)
{
struct rfcomm_session *s;
struct list_head *p, *n;
struct rfcomm_session *s, *n;
struct l2cap_chan *chan;
list_for_each_safe(p, n, &session_list) {
s = list_entry(p, struct rfcomm_session, list);
list_for_each_entry_safe(s, n, &session_list, list) {
chan = l2cap_pi(s->sock->sk)->chan;

if ((!bacmp(src, BDADDR_ANY) || !bacmp(&chan->src, src)) &&
Expand All @@ -709,16 +707,14 @@ static struct rfcomm_session *rfcomm_session_get(bdaddr_t *src, bdaddr_t *dst)
static struct rfcomm_session *rfcomm_session_close(struct rfcomm_session *s,
int err)
{
struct rfcomm_dlc *d;
struct list_head *p, *n;
struct rfcomm_dlc *d, *n;

s->state = BT_CLOSED;

BT_DBG("session %p state %ld err %d", s, s->state, err);

/* Close all dlcs */
list_for_each_safe(p, n, &s->dlcs) {
d = list_entry(p, struct rfcomm_dlc, list);
list_for_each_entry_safe(d, n, &s->dlcs, list) {
d->state = BT_CLOSED;
__rfcomm_dlc_close(d, err);
}
Expand Down Expand Up @@ -1771,13 +1767,11 @@ static struct rfcomm_session *rfcomm_recv_frame(struct rfcomm_session *s,

static void rfcomm_process_connect(struct rfcomm_session *s)
{
struct rfcomm_dlc *d;
struct list_head *p, *n;
struct rfcomm_dlc *d, *n;

BT_DBG("session %p state %ld", s, s->state);

list_for_each_safe(p, n, &s->dlcs) {
d = list_entry(p, struct rfcomm_dlc, list);
list_for_each_entry_safe(d, n, &s->dlcs, list) {
if (d->state == BT_CONFIG) {
d->mtu = s->mtu;
if (rfcomm_check_security(d)) {
Expand Down Expand Up @@ -1843,14 +1837,11 @@ static int rfcomm_process_tx(struct rfcomm_dlc *d)

static void rfcomm_process_dlcs(struct rfcomm_session *s)
{
struct rfcomm_dlc *d;
struct list_head *p, *n;
struct rfcomm_dlc *d, *n;

BT_DBG("session %p state %ld", s, s->state);

list_for_each_safe(p, n, &s->dlcs) {
d = list_entry(p, struct rfcomm_dlc, list);

list_for_each_entry_safe(d, n, &s->dlcs, list) {
if (test_bit(RFCOMM_TIMED_OUT, &d->flags)) {
__rfcomm_dlc_close(d, ETIMEDOUT);
continue;
Expand Down Expand Up @@ -1985,14 +1976,11 @@ static struct rfcomm_session *rfcomm_check_connection(struct rfcomm_session *s)

static void rfcomm_process_sessions(void)
{
struct list_head *p, *n;
struct rfcomm_session *s, *n;

rfcomm_lock();

list_for_each_safe(p, n, &session_list) {
struct rfcomm_session *s;
s = list_entry(p, struct rfcomm_session, list);

list_for_each_entry_safe(s, n, &session_list, list) {
if (test_and_clear_bit(RFCOMM_TIMED_OUT, &s->flags)) {
s->state = BT_DISCONN;
rfcomm_send_disc(s, 0);
Expand Down Expand Up @@ -2075,15 +2063,12 @@ static int rfcomm_add_listener(bdaddr_t *ba)

static void rfcomm_kill_listener(void)
{
struct rfcomm_session *s;
struct list_head *p, *n;
struct rfcomm_session *s, *n;

BT_DBG("");

list_for_each_safe(p, n, &session_list) {
s = list_entry(p, struct rfcomm_session, list);
list_for_each_entry_safe(s, n, &session_list, list)
rfcomm_session_del(s);
}
}

static int rfcomm_run(void *unused)
Expand Down Expand Up @@ -2113,18 +2098,15 @@ static int rfcomm_run(void *unused)
static void rfcomm_security_cfm(struct hci_conn *conn, u8 status, u8 encrypt)
{
struct rfcomm_session *s;
struct rfcomm_dlc *d;
struct list_head *p, *n;
struct rfcomm_dlc *d, *n;

BT_DBG("conn %p status 0x%02x encrypt 0x%02x", conn, status, encrypt);

s = rfcomm_session_get(&conn->hdev->bdaddr, &conn->dst);
if (!s)
return;

list_for_each_safe(p, n, &s->dlcs) {
d = list_entry(p, struct rfcomm_dlc, list);

list_for_each_entry_safe(d, n, &s->dlcs, list) {
if (test_and_clear_bit(RFCOMM_SEC_PENDING, &d->flags)) {
rfcomm_dlc_clear_timer(d);
if (status || encrypt == 0x00) {
Expand Down

0 comments on commit 7b22a77

Please sign in to comment.