Return-Path: Sender: "Gustavo F. Padovan" Date: Tue, 13 Jul 2010 18:01:04 -0300 From: "Gustavo F. Padovan" To: Marcel Holtmann Cc: Suraj Sumangala , linux-bluetooth@vger.kernel.org, Jothikumar.Mothilal@Atheros.com Subject: Re: [PATCH v6 1/4] add one more buffer for stream reassembly Message-ID: <20100713210104.GA3106@vigoh> References: <1279013611-4775-1-git-send-email-suraj@atheros.com> <1279054151.6282.22.camel@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1279054151.6282.22.camel@localhost.localdomain> List-ID: Hi Marcel, * Marcel Holtmann [2010-07-13 17:49:11 -0300]: > Hi Suraj, > > > Additional reassembly buffer to keep track of stream reasembly > > > > Signed-off-by: Suraj Sumangala > > --- > > include/net/bluetooth/hci_core.h | 4 ++-- > > net/bluetooth/hci_core.c | 4 ++-- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h > > index 600372d..10ad3ed 100644 > > --- a/include/net/bluetooth/hci_core.h > > +++ b/include/net/bluetooth/hci_core.h > > @@ -66,7 +66,7 @@ struct bdaddr_list { > > struct list_head list; > > bdaddr_t bdaddr; > > }; > > - > > +#define NUM_REASSEMBLY_BUFFER 4 > > Just call it NUM_REASSEMBLY. > > > struct hci_dev { > > struct list_head list; > > spinlock_t lock; > > @@ -123,7 +123,7 @@ struct hci_dev { > > struct sk_buff_head cmd_q; > > > > struct sk_buff *sent_cmd; > > - struct sk_buff *reassembly[3]; > > + struct sk_buff *reassembly[NUM_REASSEMBLY_BUFFER]; > > > > struct mutex req_lock; > > wait_queue_head_t req_wait_q; > > diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c > > index aeb2982..5df09fd 100644 > > --- a/net/bluetooth/hci_core.c > > +++ b/net/bluetooth/hci_core.c > > @@ -914,7 +914,7 @@ int hci_register_dev(struct hci_dev *hdev) > > skb_queue_head_init(&hdev->cmd_q); > > skb_queue_head_init(&hdev->raw_q); > > > > - for (i = 0; i < 3; i++) > > + for (i = 0; i < NUM_REASSEMBLY_BUFFER; i++) > > hdev->reassembly[i] = NULL; > > > > init_waitqueue_head(&hdev->req_wait_q); > > @@ -973,7 +973,7 @@ int hci_unregister_dev(struct hci_dev *hdev) > > > > hci_dev_do_close(hdev); > > > > - for (i = 0; i < 3; i++) > > + for (i = 0; i < NUM_REASSEMBLY_BUFFER; i++) > > kfree_skb(hdev->reassembly[i]); > > > > hci_notify(hdev, HCI_DEV_UNREG); > > And don't forget to modify the __reassembly macro to do -1 instead of -2 > now. Since we said we keep the [0] for the stream reassembly. The __reassembly macro is removed in the following patches. -- Gustavo F. Padovan http://padovan.org