diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-12 16:16:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-12 16:16:02 -0700 |
| commit | a7e70158884629898d79709622a66b8ef99e4018 (patch) | |
| tree | bd0cd03816f85f5bcef84000e01b0f9701f063ed /net/bluetooth/cmtp/capi.c | |
| parent | 24743537d3f784a8b3014e934fad0a9c45e4e789 (diff) | |
| parent | 252f4bf400df1712408fe83ba199a66a1b57ab1d (diff) | |
| download | op-kernel-dev-a7e70158884629898d79709622a66b8ef99e4018.zip op-kernel-dev-a7e70158884629898d79709622a66b8ef99e4018.tar.gz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/bluetooth/cmtp/capi.c')
| -rw-r--r-- | net/bluetooth/cmtp/capi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/cmtp/capi.c b/net/bluetooth/cmtp/capi.c index 67cff810..744233c 100644 --- a/net/bluetooth/cmtp/capi.c +++ b/net/bluetooth/cmtp/capi.c @@ -35,6 +35,7 @@ #include <linux/ioctl.h> #include <linux/file.h> #include <linux/wait.h> +#include <linux/kthread.h> #include <net/sock.h> #include <linux/isdn/capilli.h> @@ -143,7 +144,7 @@ static void cmtp_send_capimsg(struct cmtp_session *session, struct sk_buff *skb) skb_queue_tail(&session->transmit, skb); - cmtp_schedule(session); + wake_up_interruptible(sk_sleep(session->sock->sk)); } static void cmtp_send_interopmsg(struct cmtp_session *session, @@ -386,8 +387,7 @@ static void cmtp_reset_ctr(struct capi_ctr *ctrl) capi_ctr_down(ctrl); - atomic_inc(&session->terminate); - cmtp_schedule(session); + kthread_stop(session->task); } static void cmtp_register_appl(struct capi_ctr *ctrl, __u16 appl, capi_register_params *rp) |
