From: Mat Martineau <mathewm@codeaurora.org>
To: linux-bluetooth@vger.kernel.org
Cc: padovan@profusion.mobi, Mat Martineau <mathewm@codeaurora.org>
Subject: [PATCH 2/4] Bluetooth: Rename _busy_wq to _l2cap_wq
Date: Fri, 3 Jun 2011 16:21:08 -0700 [thread overview]
Message-ID: <1307143270-2655-2-git-send-email-mathewm@codeaurora.org> (raw)
In-Reply-To: <1307143270-2655-1-git-send-email-mathewm@codeaurora.org>
This workqueue will be used for general L2CAP work, not just dealing
with "busy" frames.
Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
---
net/bluetooth/l2cap_core.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index dc5c654..6f9daf8 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -60,7 +60,7 @@ int disable_ertm;
static u32 l2cap_feat_mask = L2CAP_FEAT_FIXED_CHAN;
static u8 l2cap_fixed_chan[8] = { 0x02, };
-static struct workqueue_struct *_busy_wq;
+static struct workqueue_struct *_l2cap_wq;
static LIST_HEAD(chan_list);
static DEFINE_RWLOCK(chan_list_lock);
@@ -3351,7 +3351,7 @@ static int l2cap_push_rx_skb(struct l2cap_chan *chan, struct sk_buff *skb, u16 c
del_timer(&chan->ack_timer);
- queue_work(_busy_wq, &chan->busy_work);
+ queue_work(_l2cap_wq, &chan->busy_work);
return err;
}
@@ -4398,8 +4398,8 @@ int __init l2cap_init(void)
if (err < 0)
return err;
- _busy_wq = create_singlethread_workqueue("l2cap");
- if (!_busy_wq) {
+ _l2cap_wq = create_singlethread_workqueue("l2cap");
+ if (!_l2cap_wq) {
err = -ENOMEM;
goto error;
}
@@ -4421,7 +4421,7 @@ int __init l2cap_init(void)
return 0;
error:
- destroy_workqueue(_busy_wq);
+ destroy_workqueue(_l2cap_wq);
l2cap_cleanup_sockets();
return err;
}
@@ -4430,8 +4430,8 @@ void l2cap_exit(void)
{
debugfs_remove(l2cap_debugfs);
- flush_workqueue(_busy_wq);
- destroy_workqueue(_busy_wq);
+ flush_workqueue(_l2cap_wq);
+ destroy_workqueue(_l2cap_wq);
if (hci_unregister_proto(&l2cap_hci_proto) < 0)
BT_ERR("L2CAP protocol unregistration failed");
--
1.7.5.2
--
Mat Martineau
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum
next prev parent reply other threads:[~2011-06-03 23:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-03 23:21 [PATCH 1/4] Bluetooth: Restore accidentally-deleted line Mat Martineau
2011-06-03 23:21 ` Mat Martineau [this message]
2011-06-06 17:31 ` [PATCH 2/4] Bluetooth: Rename _busy_wq to _l2cap_wq Gustavo F. Padovan
2011-06-08 23:24 ` Mat Martineau
2011-06-09 18:47 ` Gustavo F. Padovan
2011-06-09 23:09 ` Mat Martineau
2011-06-15 0:04 ` Gustavo F. Padovan
2011-06-16 21:48 ` Mat Martineau
2011-06-20 19:23 ` Gustavo F. Padovan
2011-06-24 22:31 ` Gustavo F. Padovan
2011-06-03 23:21 ` [PATCH 3/4] Bluetooth: Limit depth of the HCI TX queue with ERTM mode Mat Martineau
2011-06-09 2:16 ` Gustavo F. Padovan
2011-06-09 23:36 ` Mat Martineau
2011-06-14 23:31 ` Mat Martineau
2011-06-14 23:53 ` Gustavo F. Padovan
2011-06-16 22:38 ` Mat Martineau
2011-06-03 23:21 ` [PATCH 4/4] Bluetooth: Fix check for the ERTM local busy state Mat Martineau
2011-06-06 17:38 ` Gustavo F. Padovan
2011-06-06 17:37 ` [PATCH 1/4] Bluetooth: Restore accidentally-deleted line Gustavo F. Padovan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1307143270-2655-2-git-send-email-mathewm@codeaurora.org \
--to=mathewm@codeaurora.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=padovan@profusion.mobi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.