commits August 2012

commits@lists.open-mesh.org

1 participants
355 discussions

[linux-merge]linux integration; branch, batman-adv/next, updated. batman-adv-for-davem-8944-g185d3da
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

The following commit has been merged in the batman-adv/next branch: commit 847012c5e04544aef485dfec29c1c07dc90615a4 Author: Andre Guedes <andre.guedes(a)openbossa.org> Date: Fri Jul 27 15:10:12 2012 -0300 Bluetooth: Remove unneeded code This patch removes some unneeded code from hci_cs_le_create_conn. If the hci_conn is not found, it means this LE connection attempt was triggered by a thrid-party tool (e.g. hcitool). We should not create this new hci_conn in LE Create Connection command status event since it is already properly handled in LE Connection Complete event. Signed-off-by: Andre Guedes <andre.guedes(a)openbossa.org> Signed-off-by: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 8b13ccc..27064be 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1638,16 +1638,6 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status) hci_proto_connect_cfm(conn, status); hci_conn_del(conn); } - } else { - if (!conn) { - conn = hci_conn_add(hdev, LE_LINK, &cp->peer_addr); - if (conn) { - conn->dst_type = cp->peer_addr_type; - conn->out = true; - } else { - BT_ERR("No memory for new connection"); - } - } } hci_dev_unlock(hdev); -- linux integration

1 0

[linux-merge]linux integration; branch, batman-adv/next, updated. batman-adv-for-davem-8944-g185d3da
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

The following commit has been merged in the batman-adv/next branch: commit f00a06ac14becc3d78fecdf2513cc23ee267a96b Author: Andre Guedes <andre.guedes(a)openbossa.org> Date: Fri Jul 27 15:10:13 2012 -0300 Bluetooth: Refactor hci_cs_le_create_conn This patch does some code refactoring in hci_cs_le_create_conn function. The hci_conn object is only needed in case of failure, therefore hdev locking and hci_conn lookup were moved to if-statement scope. Also, the conn->state check was removed since we should always close the connection if it fails. Signed-off-by: Andre Guedes <andre.guedes(a)openbossa.org> Signed-off-by: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 27064be..c0aa9f4 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1623,24 +1623,26 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status) if (!cp) return; - hci_dev_lock(hdev); + if (status) { + hci_dev_lock(hdev); - conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->peer_addr); + conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->peer_addr); + if (!conn) { + hci_dev_unlock(hdev); + return; + } - BT_DBG("%s bdaddr %s conn %p", hdev->name, batostr(&cp->peer_addr), - conn); + BT_DBG("%s bdaddr %s conn %p", hdev->name, batostr(&cp->peer_addr), + conn); - if (status) { - if (conn && conn->state == BT_CONNECT) { - conn->state = BT_CLOSED; - mgmt_connect_failed(hdev, &cp->peer_addr, conn->type, - conn->dst_type, status); - hci_proto_connect_cfm(conn, status); - hci_conn_del(conn); - } - } + conn->state = BT_CLOSED; + mgmt_connect_failed(hdev, &cp->peer_addr, conn->type, + conn->dst_type, status); + hci_proto_connect_cfm(conn, status); + hci_conn_del(conn); - hci_dev_unlock(hdev); + hci_dev_unlock(hdev); + } } static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status) -- linux integration

1 0

[linux-merge]linux integration; branch, batman-adv/next, updated. batman-adv-for-davem-8944-g185d3da
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

The following commit has been merged in the batman-adv/next branch: commit 98921dbd00c4e2e4bdd56423cb5edf98d57b45f7 Author: Sachin Kamat <sachin.kamat(a)linaro.org> Date: Fri Jul 27 12:38:39 2012 +0530 Bluetooth: Use devm_kzalloc in btusb.c file devm_kzalloc() eliminates the need to free memory explicitly thereby saving some cleanup code. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> Acked-by: Marcel Holtmann <marcel(a)holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index e272214..f637c25 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -952,7 +952,7 @@ static int btusb_probe(struct usb_interface *intf, return -ENODEV; } - data = kzalloc(sizeof(*data), GFP_KERNEL); + data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM; @@ -975,10 +975,8 @@ static int btusb_probe(struct usb_interface *intf, } } - if (!data->intr_ep || !data->bulk_tx_ep || !data->bulk_rx_ep) { - kfree(data); + if (!data->intr_ep || !data->bulk_tx_ep || !data->bulk_rx_ep) return -ENODEV; - } data->cmdreq_type = USB_TYPE_CLASS; @@ -998,10 +996,8 @@ static int btusb_probe(struct usb_interface *intf, init_usb_anchor(&data->deferred); hdev = hci_alloc_dev(); - if (!hdev) { - kfree(data); + if (!hdev) return -ENOMEM; - } hdev->bus = HCI_USB; hci_set_drvdata(hdev, data); @@ -1069,7 +1065,6 @@ static int btusb_probe(struct usb_interface *intf, data->isoc, data); if (err < 0) { hci_free_dev(hdev); - kfree(data); return err; } } @@ -1077,7 +1072,6 @@ static int btusb_probe(struct usb_interface *intf, err = hci_register_dev(hdev); if (err < 0) { hci_free_dev(hdev); - kfree(data); return err; } @@ -1110,7 +1104,6 @@ static void btusb_disconnect(struct usb_interface *intf) usb_driver_release_interface(&btusb_driver, data->isoc); hci_free_dev(hdev); - kfree(data); } #ifdef CONFIG_PM -- linux integration

1 0

[linux-merge]linux integration; branch, batman-adv/next, updated. batman-adv-for-davem-8944-g185d3da
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

The following commit has been merged in the batman-adv/next branch: commit 4f8d81584964730b08753da34f1e3fb7981cf742 Author: Sachin Kamat <sachin.kamat(a)linaro.org> Date: Fri Jul 27 12:38:40 2012 +0530 Bluetooth: Use devm_kzalloc in btwilink.c file devm_kzalloc() eliminates the need to free memory explicitly thereby saving some cleanup code. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> Acked-by: Marcel Holtmann <marcel(a)holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c index 8869469..4ad7b35 100644 --- a/drivers/bluetooth/btwilink.c +++ b/drivers/bluetooth/btwilink.c @@ -297,16 +297,14 @@ static int bt_ti_probe(struct platform_device *pdev) struct hci_dev *hdev; int err; - hst = kzalloc(sizeof(struct ti_st), GFP_KERNEL); + hst = devm_kzalloc(&pdev->dev, sizeof(struct ti_st), GFP_KERNEL); if (!hst) return -ENOMEM; /* Expose "hciX" device to user space */ hdev = hci_alloc_dev(); - if (!hdev) { - kfree(hst); + if (!hdev) return -ENOMEM; - } BT_DBG("hdev %p", hdev); @@ -321,7 +319,6 @@ static int bt_ti_probe(struct platform_device *pdev) err = hci_register_dev(hdev); if (err < 0) { BT_ERR("Can't register HCI device error %d", err); - kfree(hst); hci_free_dev(hdev); return err; } @@ -347,7 +344,6 @@ static int bt_ti_remove(struct platform_device *pdev) hci_unregister_dev(hdev); hci_free_dev(hdev); - kfree(hst); dev_set_drvdata(&pdev->dev, NULL); return 0; -- linux integration

1 0

[linux-merge]linux integration; branch, batman-adv/next, updated. batman-adv-for-davem-8944-g185d3da
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

The following commit has been merged in the batman-adv/next branch: commit cd7cf78e9bef269ed482ad8ab572f197ae89af3c Author: Sachin Kamat <sachin.kamat(a)linaro.org> Date: Fri Jul 27 12:38:41 2012 +0530 Bluetooth: Use devm_kzalloc in dtl1_cs.c file devm_kzalloc() eliminates the need to free memory explicitly thereby saving some cleanup code. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> Acked-by: Marcel Holtmann <marcel(a)holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index 97a7784..036cb36 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c @@ -550,7 +550,7 @@ static int dtl1_probe(struct pcmcia_device *link) dtl1_info_t *info; /* Create new info device */ - info = kzalloc(sizeof(*info), GFP_KERNEL); + info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL); if (!info) return -ENOMEM; @@ -569,7 +569,6 @@ static void dtl1_detach(struct pcmcia_device *link) dtl1_close(info); pcmcia_disable_device(link); - kfree(info); } static int dtl1_confcheck(struct pcmcia_device *p_dev, void *priv_data) -- linux integration

1 0

[linux-merge]linux integration; branch, batman-adv/next, updated. batman-adv-for-davem-8944-g185d3da
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

The following commit has been merged in the batman-adv/next branch: commit 230fd16a2333fef9c012b054a127c7d157f7a7af Author: Andre Guedes <andre.guedes(a)openbossa.org> Date: Fri Jul 27 15:10:10 2012 -0300 Bluetooth: Trivial refactoring This patch replaces the unlock-and-return statements by the goto statement. Signed-off-by: Andre Guedes <andre.guedes(a)openbossa.org> Signed-off-by: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 0386e1e..e89d7f2 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -3364,8 +3364,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) conn = hci_conn_add(hdev, LE_LINK, &ev->bdaddr); if (!conn) { BT_ERR("No memory for new connection"); - hci_dev_unlock(hdev); - return; + goto unlock; } conn->dst_type = ev->bdaddr_type; -- linux integration

1 0

[linux-merge]linux integration; branch, batman-adv/next, updated. batman-adv-for-davem-8944-g185d3da
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

The following commit has been merged in the batman-adv/next branch: commit 4f61cb184fd5d16d591303aacf8dd1e623d2137d Author: Sachin Kamat <sachin.kamat(a)linaro.org> Date: Fri Jul 27 12:38:35 2012 +0530 Bluetooth: Use devm_kzalloc in bt3c_cs.c file devm_kzalloc() eliminates the need to free memory explicitly thereby saving some cleanup code. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> Acked-by: Marcel Holtmann <marcel(a)holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 8925b6d..7ffd3f4 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c @@ -638,7 +638,7 @@ static int bt3c_probe(struct pcmcia_device *link) bt3c_info_t *info; /* Create new info device */ - info = kzalloc(sizeof(*info), GFP_KERNEL); + info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL); if (!info) return -ENOMEM; @@ -654,10 +654,7 @@ static int bt3c_probe(struct pcmcia_device *link) static void bt3c_detach(struct pcmcia_device *link) { - bt3c_info_t *info = link->priv; - bt3c_release(link); - kfree(info); } static int bt3c_check_config(struct pcmcia_device *p_dev, void *priv_data) -- linux integration

1 0

[linux-merge]linux integration; branch, batman-adv/next, updated. batman-adv-for-davem-8944-g185d3da
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

The following commit has been merged in the batman-adv/next branch: commit eb17ea3b1ce6302e7416c4ba58754fd70ee3ab62 Author: Sachin Kamat <sachin.kamat(a)linaro.org> Date: Fri Jul 27 12:38:36 2012 +0530 Bluetooth: Use devm_kzalloc in btmrvl_sdio.c file devm_kzalloc() eliminates the need to free memory explicitly thereby saving some cleanup code. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> Acked-by: Marcel Holtmann <marcel(a)holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 6a9e971..03b3acb 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -956,11 +956,9 @@ static int btmrvl_sdio_probe(struct sdio_func *func, BT_INFO("vendor=0x%x, device=0x%x, class=%d, fn=%d", id->vendor, id->device, id->class, func->num); - card = kzalloc(sizeof(*card), GFP_KERNEL); - if (!card) { - ret = -ENOMEM; - goto done; - } + card = devm_kzalloc(&func->dev, sizeof(*card), GFP_KERNEL); + if (!card) + return -ENOMEM; card->func = func; @@ -974,8 +972,7 @@ static int btmrvl_sdio_probe(struct sdio_func *func, if (btmrvl_sdio_register_dev(card) < 0) { BT_ERR("Failed to register BT device!"); - ret = -ENODEV; - goto free_card; + return -ENODEV; } /* Disable the interrupts on the card */ @@ -1023,9 +1020,6 @@ disable_host_int: btmrvl_sdio_disable_host_int(card); unreg_dev: btmrvl_sdio_unregister_dev(card); -free_card: - kfree(card); -done: return ret; } @@ -1047,7 +1041,6 @@ static void btmrvl_sdio_remove(struct sdio_func *func) BT_DBG("unregester dev"); btmrvl_sdio_unregister_dev(card); btmrvl_remove_card(card->priv); - kfree(card); } } } -- linux integration

1 0

[linux-merge]linux integration; branch, batman-adv/next, updated. batman-adv-for-davem-8944-g185d3da
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

The following commit has been merged in the batman-adv/next branch: commit 3a382772b51bbf55b23701746102bd75b9fe883f Author: Sachin Kamat <sachin.kamat(a)linaro.org> Date: Fri Jul 27 12:38:37 2012 +0530 Bluetooth: Use devm_kzalloc in btsdio.c file devm_kzalloc() eliminates the need to free memory explicitly thereby saving some cleanup code. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> Acked-by: Marcel Holtmann <marcel(a)holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c index e10ea03..4a99097 100644 --- a/drivers/bluetooth/btsdio.c +++ b/drivers/bluetooth/btsdio.c @@ -304,7 +304,7 @@ static int btsdio_probe(struct sdio_func *func, tuple = tuple->next; } - data = kzalloc(sizeof(*data), GFP_KERNEL); + data = devm_kzalloc(&func->dev, sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM; @@ -315,10 +315,8 @@ static int btsdio_probe(struct sdio_func *func, skb_queue_head_init(&data->txq); hdev = hci_alloc_dev(); - if (!hdev) { - kfree(data); + if (!hdev) return -ENOMEM; - } hdev->bus = HCI_SDIO; hci_set_drvdata(hdev, data); @@ -340,7 +338,6 @@ static int btsdio_probe(struct sdio_func *func, err = hci_register_dev(hdev); if (err < 0) { hci_free_dev(hdev); - kfree(data); return err; } @@ -366,7 +363,6 @@ static void btsdio_remove(struct sdio_func *func) hci_unregister_dev(hdev); hci_free_dev(hdev); - kfree(data); } static struct sdio_driver btsdio_driver = { -- linux integration

1 0

[linux-merge]linux integration; branch, batman-adv/next, updated. batman-adv-for-davem-8944-g185d3da
by postmaster＠open-mesh.org 21 Aug '12

21 Aug '12

The following commit has been merged in the batman-adv/next branch: commit fdefa118ebbcadad4adbaaab067be06a96a48e15 Author: Sachin Kamat <sachin.kamat(a)linaro.org> Date: Fri Jul 27 12:38:38 2012 +0530 Bluetooth: Use devm_kzalloc in btuart_cs.c file devm_kzalloc() eliminates the need to free memory explicitly thereby saving some cleanup code. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> Acked-by: Marcel Holtmann <marcel(a)holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index 21e803a..2f510a8 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c @@ -567,7 +567,7 @@ static int btuart_probe(struct pcmcia_device *link) btuart_info_t *info; /* Create new info device */ - info = kzalloc(sizeof(*info), GFP_KERNEL); + info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL); if (!info) return -ENOMEM; @@ -583,10 +583,7 @@ static int btuart_probe(struct pcmcia_device *link) static void btuart_detach(struct pcmcia_device *link) { - btuart_info_t *info = link->priv; - btuart_release(link); - kfree(info); } static int btuart_check_config(struct pcmcia_device *p_dev, void *priv_data) -- linux integration

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits August 2012