From patchwork Thu Dec 6 07:50:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Monoses X-Patchwork-Id: 204173 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 4B6CA2C01C2 for ; Thu, 6 Dec 2012 18:51:18 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TgWEe-0003rr-H0; Thu, 06 Dec 2012 07:51:08 +0000 Received: from plane.gmane.org ([80.91.229.3]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TgWEd-0003rO-0i for kernel-team@lists.ubuntu.com; Thu, 06 Dec 2012 07:51:07 +0000 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1TgWEo-0008Ro-2t for kernel-team@lists.ubuntu.com; Thu, 06 Dec 2012 08:51:18 +0100 Received: from 79.119.113.201 ([79.119.113.201]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 06 Dec 2012 08:51:18 +0100 Received: from jani by 79.119.113.201 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 06 Dec 2012 08:51:18 +0100 X-Injected-Via-Gmane: http://gmane.org/ To: kernel-team@lists.ubuntu.com From: Jani Monoses Subject: [Raring] Fix bluetoothd crash on Nexus7 Date: Thu, 06 Dec 2012 09:50:44 +0200 Lines: 88 Message-ID: Mime-Version: 1.0 X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 79.119.113.201 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121010 Thunderbird/16.0.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This reverts an Android specific patch that causes bluetoothd to crash. The bug was found by Mursalin Akon and a .deb tested by Till Kamppeter. https://bugs.launchpad.net/ubuntu-nexus7/+bug/1070770 From 5c584b27b1ec1d1118ccb104fe35a4b2f05e57bc Mon Sep 17 00:00:00 2001 From: Jani Monoses Date: Thu, 6 Dec 2012 00:33:38 +0200 Subject: [PATCH] Revert "Bluetooth: Add ACL MTU, available buffers and total buffers to hci_conn_info." This reverts commit d4076ae3b7eff09f9d4c1f4193572e27db59dbd9 in order to fix bluetoothd crashing. (Thanks to Mursalin Akon) BugLink: https://bugs.launchpad.net/ubuntu-nexus7/+bug/1070770 --- include/net/bluetooth/hci.h | 3 --- net/bluetooth/hci_conn.c | 18 ------------------ 2 files changed, 21 deletions(-) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 915d7ae..cabbeb4 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -1264,9 +1264,6 @@ struct hci_conn_info { __u8 out; __u16 state; __u32 link_mode; - __u32 mtu; - __u32 cnt; - __u32 pkts; }; struct hci_dev_req { diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 33c4e0c..b73e9f1 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -907,15 +907,6 @@ int hci_get_conn_list(void __user *arg) (ci + n)->out = c->out; (ci + n)->state = c->state; (ci + n)->link_mode = c->link_mode; - if (c->type == SCO_LINK) { - (ci + n)->mtu = hdev->sco_mtu; - (ci + n)->cnt = hdev->sco_cnt; - (ci + n)->pkts = hdev->sco_pkts; - } else { - (ci + n)->mtu = hdev->acl_mtu; - (ci + n)->cnt = hdev->acl_cnt; - (ci + n)->pkts = hdev->acl_pkts; - } if (++n >= req.conn_num) break; } @@ -952,15 +943,6 @@ int hci_get_conn_info(struct hci_dev *hdev, void __user *arg) ci.out = conn->out; ci.state = conn->state; ci.link_mode = conn->link_mode; - if (req.type == SCO_LINK) { - ci.mtu = hdev->sco_mtu; - ci.cnt = hdev->sco_cnt; - ci.pkts = hdev->sco_pkts; - } else { - ci.mtu = hdev->acl_mtu; - ci.cnt = hdev->acl_cnt; - ci.pkts = hdev->acl_pkts; - } } hci_dev_unlock_bh(hdev); -- 1.7.10.4